diff --git a/scss/backend.scss b/scss/backend.scss index 3e279a3..2c3ed6d 100644 --- a/scss/backend.scss +++ b/scss/backend.scss @@ -26,9 +26,10 @@ $border-radius: 5px; @import 'import/_main.scss'; @import 'import/_nav.scss'; -@import 'import/repository.scss'; -@import 'import/explore.scss'; -@import 'import/user.scss'; +@import 'import/admin.scss'; @import 'import/dashboard.scss'; +@import 'import/explore.scss'; +@import 'import/repository.scss'; +@import 'import/user.scss'; @import 'import/_footer.scss'; diff --git a/scss/frontend.scss b/scss/frontend.scss index 5f2397f..a755b92 100644 --- a/scss/frontend.scss +++ b/scss/frontend.scss @@ -26,8 +26,8 @@ $border-radius: 5px; @import 'import/_main.scss'; @import 'import/_nav.scss'; -@import 'import/repository.scss'; @import 'import/explore.scss'; +@import 'import/repository.scss'; @import 'import/user.scss'; @import 'import/_footer.scss'; diff --git a/scss/import/admin.scss b/scss/import/admin.scss new file mode 100644 index 0000000..9ab457d --- /dev/null +++ b/scss/import/admin.scss @@ -0,0 +1,6 @@ + +/* admin: settings */ + +.admin { + @include secondary-menu_new-menu; +} diff --git a/scss/import/explore.scss b/scss/import/explore.scss index 81eac69..553a6f6 100644 --- a/scss/import/explore.scss +++ b/scss/import/explore.scss @@ -2,30 +2,7 @@ /* explore: repositories / main */ .explore { - .secondary.menu { - background-color: $bg70 !important; - border-radius: 0; - .item { - color: $white-dark; - &:hover { - color: $white-light !important; - } - &.active { - color: $white !important; - &:hover { - color: $white-light; - } - } - svg { - @if $nojavascript == true { - display: none; - } - } - .label { - background: $bg60; - } - } - } + @include secondary-menu_new-menu; .container { @if $nojavascript == true { .filter.menu { diff --git a/scss/import/include.scss b/scss/import/include.scss index a084524..2a7f40d 100644 --- a/scss/import/include.scss +++ b/scss/import/include.scss @@ -238,3 +238,30 @@ } } } + +@mixin secondary-menu_new-menu { + .secondary.menu { + background-color: $bg70 !important; + border-radius: 0; + .item { + color: $white-dark; + &:hover { + color: $white-light !important; + } + &.active { + color: $white !important; + &:hover { + color: $white-light; + } + } + svg { + @if $nojavascript == true { + display: none; + } + } + .label { + background: $bg60; + } + } + } +} diff --git a/scss/import/repository.scss b/scss/import/repository.scss index b2b8ef0..4e7f39c 100644 --- a/scss/import/repository.scss +++ b/scss/import/repository.scss @@ -1301,6 +1301,15 @@ } } +/* repository: settings */ + +.repository.settings { + @include secondary-menu_new-menu; + .secondary.menu.new-menu { + margin-top: -21px !important; + } +} + /* repository: commits */ .repository.commits { diff --git a/scss/import/user.scss b/scss/import/user.scss index 40f2197..b15803a 100644 --- a/scss/import/user.scss +++ b/scss/import/user.scss @@ -335,3 +335,9 @@ } } } + +/* user: settings */ + +.user.settings { + @include secondary-menu_new-menu; +}