Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
a39ae4c7
Commit
a39ae4c7
authored
Jun 02, 2021
by
Denys Mishunov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Addressed the UX review
parent
65a1bbdc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
37 additions
and
7 deletions
+37
-7
app/assets/stylesheets/framework/contextual_sidebar_refactoring/contextual_sidebar_variant.scss
...xtual_sidebar_refactoring/contextual_sidebar_variant.scss
+36
-6
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+1
-1
No files found.
app/assets/stylesheets/framework/contextual_sidebar_refactoring/contextual_sidebar_variant.scss
View file @
a39ae4c7
//
// VARIABLES
//
$top-level-item-color
:
$purple-900
;
//
// TEMPORARY OVERRIDES
// Needed while we serve both *_base and *_variant stylesheets
...
...
@@ -14,6 +20,14 @@
color
:
$gray-darkest
;
}
&
.ui-indigo
.nav-sidebar
li
.active
>
a
{
color
:
$top-level-item-color
;
}
&
.ui-indigo
.nav-sidebar
li
.active
.nav-icon-container
svg
{
fill
:
$top-level-item-color
;
}
.nav-sidebar
{
box-shadow
:
none
;
...
...
@@ -138,13 +152,29 @@
}
@mixin
context-header
{
$avatar-box-shadow
:
inset
0
0
0
1px
$t-gray-a-08
;
@include
gl-p-2
;
@include
gl-mb-2
;
.avatar-container
{
@include
gl-font-weight-normal
;
flex
:
0
0
$sidebar-avatar-size
;
border-color
:
$t-gray-a-08
;
flex
:
none
;
box-shadow
:
$avatar-box-shadow
;
&
.rect-avatar
{
@include
gl-border-none
;
.avatar.s32
{
@extend
.rect-avatar.s32
;
color
:
$gray-900
;
box-shadow
:
$avatar-box-shadow
;
}
}
}
.sidebar-context-title
{
color
:
$top-level-item-color
;
}
}
...
...
@@ -221,7 +251,7 @@
a
{
@include
gl-text-decoration-none
;
@include
gl-line-height-normal
;
color
:
$
purple-900
;
color
:
$
top-level-item-color
;
}
li
{
...
...
@@ -310,8 +340,8 @@
}
.badge.badge-pill
{
@include
gl-font-weight-normal
;
// TODO: update in `theme_
indigo
.scss`
color
:
$blue-700
;
// TODO: update in `theme_
indigo
.scss`
@include
gl-font-weight-normal
;
// TODO: update in `theme_
helper
.scss`
color
:
$blue-700
;
// TODO: update in `theme_
helper
.scss`
}
}
}
...
...
@@ -348,7 +378,7 @@
.close-nav-button
{
@include
side-panel-toggle
;
background-color
:
$gray-50
;
color
:
$
purple-900
;
color
:
$
top-level-item-color
;
.collapse-text
,
.icon-chevron-double-lg-left
,
...
...
app/assets/stylesheets/framework/variables.scss
View file @
a39ae4c7
...
...
@@ -573,7 +573,7 @@ $inactive-badge-background: rgba($black, 0.08);
$sidebar-toggle-height
:
60px
;
$sidebar-toggle-width
:
40px
;
$sidebar-milestone-toggle-bottom-margin
:
10px
;
$sidebar-avatar-size
:
3
4
px
;
$sidebar-avatar-size
:
3
2
px
;
$sidebar-top-item-lr-margin
:
4px
;
$sidebar-top-item-tb-margin
:
1px
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment