diff --git a/app/assets/stylesheets/mobile.scss b/app/assets/stylesheets/mobile.scss index 164d1cbbc8f..12cc495d606 100644 --- a/app/assets/stylesheets/mobile.scss +++ b/app/assets/stylesheets/mobile.scss @@ -22,7 +22,6 @@ @import "mobile/emoji"; @import "mobile/ring"; @import "mobile/group"; -@import "mobile/groups"; @import "mobile/dashboard_next"; @import "mobile/admin_customize"; @import "mobile/admin_reports"; diff --git a/app/assets/stylesheets/mobile/alert.scss b/app/assets/stylesheets/mobile/alert.scss index 0c126089280..36da632ce5a 100644 --- a/app/assets/stylesheets/mobile/alert.scss +++ b/app/assets/stylesheets/mobile/alert.scss @@ -1,12 +1,5 @@ -.alert { - margin: 15px 0 5px 0; -} - // there are (n) new or updated topics, click to show .alert.alert-info { margin: 0; - margin-bottom: -3px; - margin-top: -5px; - padding: 15px; - font-size: $font-0; + padding: 1em; } diff --git a/app/assets/stylesheets/mobile/banner.scss b/app/assets/stylesheets/mobile/banner.scss index 9380ca2ada5..852b2847364 100644 --- a/app/assets/stylesheets/mobile/banner.scss +++ b/app/assets/stylesheets/mobile/banner.scss @@ -6,12 +6,8 @@ // go full width on mobile, by extending into the 10px wrap // borders on left and right margin: 0 -10px; - + max-height: 180px; @media all and (max-height: 499px) { max-height: 100px; } - - @media all and (min-height: 500px) { - max-height: 180px; - } } diff --git a/app/assets/stylesheets/mobile/buttons.scss b/app/assets/stylesheets/mobile/buttons.scss index 652f8a86014..1bb5fde75ed 100644 --- a/app/assets/stylesheets/mobile/buttons.scss +++ b/app/assets/stylesheets/mobile/buttons.scss @@ -1,5 +1,3 @@ h3 .top-title-buttons button { - margin-right: 10px; - clear: both; - margin-top: 5px; + margin-top: 0.5em; } diff --git a/app/assets/stylesheets/mobile/dashboard_next.scss b/app/assets/stylesheets/mobile/dashboard_next.scss index 38fd6240796..2d2ce284b3f 100644 --- a/app/assets/stylesheets/mobile/dashboard_next.scss +++ b/app/assets/stylesheets/mobile/dashboard_next.scss @@ -2,4 +2,7 @@ .activity-metrics .counters-list { font-size: $font-down-1; } + .navigation a.navigation-link { + padding: 0.5em; + } } diff --git a/app/assets/stylesheets/mobile/directory.scss b/app/assets/stylesheets/mobile/directory.scss index 15fdb951658..baa21992859 100644 --- a/app/assets/stylesheets/mobile/directory.scss +++ b/app/assets/stylesheets/mobile/directory.scss @@ -1,18 +1,38 @@ -.directory .user { - border-top: 1px solid $primary-low; - padding: 1em; +.directory { + .select-kit.dropdown-select-box.period-chooser + .period-chooser-header + h2.selected-name { + font-size: $font-up-1; + margin-bottom: 0.25em; + } - .user-stat { - margin-left: 55px; - .value { - font-weight: bold; + .filter-name { + float: left; + } + + .user { + border-top: 1px solid $primary-low; + padding: 1em; + display: flex; + flex-wrap: wrap; + + .user-info { + width: 100%; + margin-bottom: 1em; } - .label { - margin-left: 0.2em; - color: $primary-medium; - } - .d-icon-heart { - color: $love; + + .user-stat { + flex: 1 1 50%; + .value { + font-weight: bold; + } + .label { + margin-left: 0.2em; + color: $primary-medium; + } + .d-icon-heart { + color: $love; + } } } } diff --git a/app/assets/stylesheets/mobile/group.scss b/app/assets/stylesheets/mobile/group.scss index 95bf29956ca..99c0d05633b 100644 --- a/app/assets/stylesheets/mobile/group.scss +++ b/app/assets/stylesheets/mobile/group.scss @@ -2,10 +2,6 @@ margin-top: 15px; } -.group-header { - margin: 0; -} - .group-name { margin: 5px 0 0 0; } @@ -14,48 +10,11 @@ width: 100%; } -.group-details-container { - margin-bottom: 15px; -} - -.group-nav.mobile-nav { - float: left; -} - .group-activity, .group-manage { position: relative; } -.group-navigation { - &.mobile-nav { - position: absolute; - right: 0; - top: -51px; - } -} - -.group-activity-outlet, -.group-messages-outlet { - float: none; -} - -.form-horizontal { - .control-group { - margin-bottom: 10px; - } - - .group-flair-inputs { - .group-flair-right { - margin: 0; - } - } -} - -table.group-manage-logs { - width: 130%; -} - .group-members { .group-member { border-top: 1px solid $primary-low; @@ -71,7 +30,7 @@ table.group-manage-logs { } .group-member-info { - color: dark-light-choose($primary-medium, $secondary-medium); + color: $primary-medium; label { margin-bottom: 0; @@ -81,27 +40,3 @@ table.group-manage-logs { } } } - -.group-outlet { - .group-username-filter { - position: absolute; - right: 0px; - top: -42px; - height: 27px; - margin-bottom: 0px; - } - - .group-members-manage { - width: 100%; - text-align: right; - } - - .group-members-dropdown, - .group-members-add { - margin: 5px 0px; - } -} - -.group-add-members-btn { - margin-bottom: 10px; -} diff --git a/app/assets/stylesheets/mobile/groups.scss b/app/assets/stylesheets/mobile/groups.scss deleted file mode 100644 index 2b444c9b5dd..00000000000 --- a/app/assets/stylesheets/mobile/groups.scss +++ /dev/null @@ -1,24 +0,0 @@ -.groups-page { - h1 { - margin-top: 20px; - } - - .groups-header-filters { - display: block; - float: none; - } - - .groups-header-filters-name, - .groups-header-filters-type, - .groups-header-new { - margin-top: 10px; - } - @include breakpoint(mobile-small) { - .groups-header-filters-name { - width: 50%; - } - .groups-header-filters-type { - width: 100%; - } - } -} diff --git a/app/assets/stylesheets/mobile/modal.scss b/app/assets/stylesheets/mobile/modal.scss index 20b8c4f93cc..d8dc8152707 100644 --- a/app/assets/stylesheets/mobile/modal.scss +++ b/app/assets/stylesheets/mobile/modal.scss @@ -111,32 +111,6 @@ } } -#search-help { - max-width: 98%; -} - -// this makes the table behave like a flat list -#search-help td { - display: block; - padding-left: 10px; -} - -#search-help h3 { - display: none; -} - -#search-help p { - margin: 10px; -} - -#search-help .btn-primary { - float: none; -} - -#google-search form { - padding-left: 10px; -} - .change-timestamp-footer .btn-primary { float: right; margin-right: 5px; diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss index a812fe578a0..cc062ce6d9c 100644 --- a/app/assets/stylesheets/mobile/topic-post.scss +++ b/app/assets/stylesheets/mobile/topic-post.scss @@ -400,7 +400,7 @@ blockquote { } span.highlighted { - background-color: dark-light-choose($highlight-low, $highlight); + background-color: $highlight-low; } .topic-avatar { @@ -446,11 +446,11 @@ span.highlighted { } .username.new-user a { - color: dark-light-choose($primary-low-mid, $secondary-high); + color: $primary-low-mid; } .user-title { - color: #aaa; + color: $primary-medium; overflow: hidden; margin-right: 50px; } diff --git a/app/assets/stylesheets/mobile/topic.scss b/app/assets/stylesheets/mobile/topic.scss index 05945ceac1f..333fda79028 100644 --- a/app/assets/stylesheets/mobile/topic.scss +++ b/app/assets/stylesheets/mobile/topic.scss @@ -1,5 +1,5 @@ .post-info a { - color: #aaa; + color: $primary-medium; } .topic-meta-data-inside { @@ -13,7 +13,6 @@ } #topic-title { - //margin-bottom: 20px; margin: 0 60px 10px 0; h1 { font-size: $font-up-3; diff --git a/app/assets/stylesheets/mobile/upload.scss b/app/assets/stylesheets/mobile/upload.scss index 263b32e8b46..40d7faa9d91 100644 --- a/app/assets/stylesheets/mobile/upload.scss +++ b/app/assets/stylesheets/mobile/upload.scss @@ -7,7 +7,7 @@ line-height: $line-height-medium; } .description { - color: dark-light-choose($primary-medium, $secondary-medium); + color: $primary-medium; } .radios { display: flex;