diff options
Diffstat (limited to 'assets/stylesheets')
-rw-r--r-- | assets/stylesheets/responsive/_settings.scss | 4 | ||||
-rw-r--r-- | assets/stylesheets/responsive/custom.scss | 47 |
2 files changed, 42 insertions, 9 deletions
diff --git a/assets/stylesheets/responsive/_settings.scss b/assets/stylesheets/responsive/_settings.scss index 466c902..015aece 100644 --- a/assets/stylesheets/responsive/_settings.scss +++ b/assets/stylesheets/responsive/_settings.scss @@ -19,6 +19,10 @@ $color_red: #e04b4b; $color_violet: #a94ca6; $color_purple: #5c377f; $color_white: #ffffff; +$color_off_white: #f3f1eb; +$color_light_grey: #e2dfd9; +$color_mid_grey: #959287; +$color_dark_grey: #6c6b68; $color_neutral_light: $color_sand; $color_neutral_dark: $color_black; diff --git a/assets/stylesheets/responsive/custom.scss b/assets/stylesheets/responsive/custom.scss index c93d8a4..d32f609 100644 --- a/assets/stylesheets/responsive/custom.scss +++ b/assets/stylesheets/responsive/custom.scss @@ -173,6 +173,28 @@ a.link_button_green_large { @include button-primary($size: large); } + +/* Action Bar Mixins */ + +@mixin follow-button { + border-top-right-radius: 0; + border-bottom-right-radius: 0; + margin-bottom: 0; +} + +@mixin follower-count { + color: $color_dark_grey; + padding: 0.56em 1.25em; + border: 1px solid $color_light_grey; + position: relative; + left: -3px; + line-height: 1.6em; + border-left: 0; + border-radius: 3px; + border-top-left-radius: 0; + border-bottom-left-radius: 0; +} + /* Popups */ .popup { @@ -543,17 +565,21 @@ a.link_button_green_large { .request-header__action-bar__actions { .action-menu__button { @include button-secondary(); + &:after { + border-color: #a5a5a5 transparent transparent transparent; + right: 7%; + } } .action-bar__follow-button { .track__action { @include button-primary(); + @include follow-button(); } } .action-bar__follower-count { - padding: 3px; - font-size: 1.1rem; + @include follower-count(); } } @@ -797,14 +823,17 @@ dt { } /* Authority page */ -.action-bar__follower-count { - padding: 3px; - font-size: 1.1rem; -} +.authority__header__action-bar { + .action-bar__follow-button { + .track_action, + .link_button_green { + @include button-secondary(); + @include follow-button(); + } + } -.action-bar__follow-button { - .link_button_green { - @include button-secondary(); + .action-bar__follower-count { + @include follower-count(); } } |