Unverified Commit 07d0ed91 authored by flaburgan's avatar flaburgan Committed by Benjamin Neff
Browse files

Fix design issues + pronto 

closes #7295
parent 427aa879

Changelog.md

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
## Features

* Change email without confirmation when mail is disabled [#7455](https://github.com/diaspora/diaspora/pull/7455)

* Warn users if they leave the profile editing page with unsaved changes [#7473](https://github.com/diaspora/diaspora/pull/7473)

* Add admin pages to the mobile interface [#7295](https://github.com/diaspora/diaspora/pull/7295)



# 0.6.6.0

app/assets/stylesheets/admin.scss

+19 −7
Original line number Diff line number Diff line
@@ -2,9 +2,9 @@ 
@import 'bootstrap-variables';

@import 'animations';



/** ADMIN STYlES **/

/** user search **/

// ADMIN STYlES



// user search

.users {

  li.user {

    border-bottom: 1px solid $light-grey;
@@ -23,7 +23,7 @@ 
  }

}



/** Invites panel **/

// Invites panel

.more_invites{

  #add-invites-section{

    line-height: 34px;
@@ -31,9 +31,13 @@ 
  }

}



.invite-emails {

  margin-bottom: 10px;

}



// Weekly stats

.week-selector {

  margin-top: 18px;

  margin-top: 10px;

}



// Pod stats
@@ -44,8 +48,17 @@ 
  }

}



/** reported posts **/

.percent-change {

  &.increase {

    color: $increase;

  }



  &.decrease {

    color: $decrease;

  }

}



// reported posts

.reports {

  .reason-label {

    font-weight: bold;
@@ -60,8 +73,7 @@ 
  }

}



/** pod list **/



// pod list

#pod-list {

  .pod-title {

    max-width: 200px;

app/assets/stylesheets/color-variables.scss

+3 −0
Original line number Diff line number Diff line
@@ -32,3 +32,6 @@ $left-navbar-drawer-background: darken($white, 6%) !default; 
$hovercard-background: $white !default;



$card-shadow: 0 1px 2px 0 rgba(0, 0, 0, .16), 0 2px 10px 0 rgba(0, 0, 0, .12) !default;



$increase: #008000;

$decrease: #fe0000;

app/views/admins/_stats.haml

+44 −41
Original line number Diff line number Diff line 
- content_for :head do

  = stylesheet_link_tag :admin



%h1= t(".usage_statistic")



.container-fluid

  .row

  = form_tag("/admins/stats", method: "get", class: "col-sm-12 form-inline segment-selection") do

    .col-sm-2.col-sm-push-8

    .col-sm-9

      %h1= t(".usage_statistic")

    .col-sm-3

      = form_tag("/admins/stats", method: "get", class: "row form-inline segment-selection") do

        .col-sm-8

          %select.form-control{name: "range"}

            - %w(daily week 2weeks month).each do |range|

              %option{value: range, selected: ("selected" if params[:range] == range)}

                = t(".#{range}")

    .col-sm-2.col-sm-push-8

        .col-sm-4

          = submit_tag t(".go"), class: "btn btn-primary btn-block"



  .col-sm-8.col-sm-pull-4

  .row

    .col-xs-12

      %h4

        != t("admins.stats.display_results", segment: content_tag(:strong, segment))
@@ -22,14 +25,14 @@ 
      :ruby

        model = instance_variable_get("@#{name}")

        count = model[:yesterday]

      name = name == :aspect_memberships ? t(".shares", count: count) : t(".#{name}", count: count)

        label_with_count = name == :aspect_memberships ? t(".shares", count: count) : t(".#{name}", count: count)



      .col-md-3

        %h2{style: "font-weight:bold;"}

        = name.to_s

          = label_with_count

        %h4

          = model[:day_before]

        %span.percent_change{class: (model[:change] > 0 ? "green" : "red")}

          %span.percent-change{class: (model[:change] > 0 ? "increase" : "decrease")}

            = "(#{model[:change]}%)"



  .row

app/views/admins/_user_search.haml

+1 −1
Original line number Diff line number Diff line
@@ -52,6 +52,6 @@ 
        %label.col-xs-12.col-md-2.control-label

          = t(".email_to")

        .col-xs-12.col-md-8

          = text_field_tag "identifier", nil, class: "form-control"

          = text_field_tag "identifier", nil, class: "form-control invite-emails"

        .col-xs-12.col-md-2

          = submit_tag t(".invite"), class: "btn btn-block btn-primary"