diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-12-05 18:26:22 +0300 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-12-05 18:38:16 +0300 |
commit | c73a5d596f8b239a8f43d9825d893b96a2f7457a (patch) | |
tree | d17d4eba724964c9e0aeaebb4add8d2922adaf6c /app/assets | |
parent | 30815a8940c642fa738203da9eda8046eaa0da10 (diff) |
Truncate fix, remove unneeded admin-specific css
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/stylesheets/framework/blocks.scss | 5 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/common.scss | 10 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/wells.scss | 13 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/admin.scss | 42 |
4 files changed, 22 insertions, 48 deletions
diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss index 57db5eaa2b3..fbcb2659585 100644 --- a/app/assets/stylesheets/framework/blocks.scss +++ b/app/assets/stylesheets/framework/blocks.scss @@ -1,8 +1,3 @@ -.light-well { - background-color: $background-color; - padding: 15px; -} - .centered-light-block { text-align: center; color: $gl-gray; diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss index 16646e33a4b..b662282aa1d 100644 --- a/app/assets/stylesheets/framework/common.scss +++ b/app/assets/stylesheets/framework/common.scss @@ -379,7 +379,9 @@ table { border-top: 1px solid $border-color; } -.hide-bottom-border { border-bottom: none !important; } +.hide-bottom-border { + border-bottom: none !important; +} .gl-accessibility { &:focus { @@ -396,3 +398,9 @@ table { z-index: 1; } } + +.str-truncated { + &-60 { + @include str-truncated(60%); + } +} diff --git a/app/assets/stylesheets/framework/wells.scss b/app/assets/stylesheets/framework/wells.scss index 192939f4527..f2860dfe84d 100644 --- a/app/assets/stylesheets/framework/wells.scss +++ b/app/assets/stylesheets/framework/wells.scss @@ -43,3 +43,16 @@ background-color: $well-expand-item; } } + +.light-well { + background-color: $background-color; + padding: 15px; +} + +.well-centered { + h1 { + font-weight: normal; + text-align: center; + font-size: 48px; + } +} diff --git a/app/assets/stylesheets/pages/admin.scss b/app/assets/stylesheets/pages/admin.scss index 44eac21b143..dbf9db39651 100644 --- a/app/assets/stylesheets/pages/admin.scss +++ b/app/assets/stylesheets/pages/admin.scss @@ -2,48 +2,6 @@ * Admin area * */ -.admin-dashboard { - .data { - a { - h1 { - line-height: 48px; - font-size: 48px; - padding: 20px; - text-align: center; - font-weight: normal; - } - } - } - - .str-truncated { - max-width: 60%; - } -} - -.admin-filter form { - .select2-container { - width: 100%; - } - - .controls { - margin-left: 130px; - } - - .form-actions { - padding-left: 130px; - background: $white-light; - } - - .visibility-levels { - .controls { - margin-bottom: 9px; - } - - i { - color: inherit; - } - } -} .broadcast-messages { .message { |