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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
a241b872
Commit
a241b872
authored
Sep 25, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix UI bugs
parent
ca980de3
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
12 deletions
+15
-12
app/assets/stylesheets/framework/new-nav.scss
app/assets/stylesheets/framework/new-nav.scss
+5
-2
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+1
-0
app/assets/stylesheets/pages/search.scss
app/assets/stylesheets/pages/search.scss
+9
-10
No files found.
app/assets/stylesheets/framework/new-nav.scss
View file @
a241b872
...
@@ -306,8 +306,6 @@ header.navbar-gitlab-new {
...
@@ -306,8 +306,6 @@ header.navbar-gitlab-new {
display
:
flex
;
display
:
flex
;
width
:
100%
;
width
:
100%
;
position
:
relative
;
position
:
relative
;
padding-top
:
$gl-padding
;
padding-bottom
:
$gl-padding
;
align-items
:
center
;
align-items
:
center
;
border-bottom
:
1px
solid
$border-color
;
border-bottom
:
1px
solid
$border-color
;
}
}
...
@@ -319,6 +317,11 @@ header.navbar-gitlab-new {
...
@@ -319,6 +317,11 @@ header.navbar-gitlab-new {
align-self
:
center
;
align-self
:
center
;
color
:
$gl-text-color-secondary
;
color
:
$gl-text-color-secondary
;
@media
(
max-width
:
$screen-xs-max
)
{
padding-left
:
17px
;
border-left
:
1px
solid
$gl-text-color-quaternary
;
}
.avatar-tile
{
.avatar-tile
{
margin-right
:
4px
;
margin-right
:
4px
;
border
:
1px
solid
$border-color
;
border
:
1px
solid
$border-color
;
...
...
app/assets/stylesheets/framework/variables.scss
View file @
a241b872
...
@@ -6,6 +6,7 @@ $gutter_width: 290px;
...
@@ -6,6 +6,7 @@ $gutter_width: 290px;
$gutter_inner_width
:
250px
;
$gutter_inner_width
:
250px
;
$sidebar-transition-duration
:
.15s
;
$sidebar-transition-duration
:
.15s
;
$sidebar-breakpoint
:
1024px
;
$sidebar-breakpoint
:
1024px
;
$default-transition-duration
:
.15s
;
/*
/*
* Color schema
* Color schema
...
...
app/assets/stylesheets/pages/search.scss
View file @
a241b872
...
@@ -39,7 +39,7 @@ input[type="checkbox"]:hover {
...
@@ -39,7 +39,7 @@ input[type="checkbox"]:hover {
height
:
32px
;
height
:
32px
;
border
:
0
;
border
:
0
;
border-radius
:
$border-radius-default
;
border-radius
:
$border-radius-default
;
transition
:
border-color
ease-in-out
0
.15s
,
background-color
ease-in-out
0
.15s
;
transition
:
border-color
ease-in-out
$default-transition-duration
,
background-color
ease-in-out
$default-transition-duration
;
&
:hover
{
&
:hover
{
box-shadow
:
none
;
box-shadow
:
none
;
...
@@ -51,9 +51,8 @@ input[type="checkbox"]:hover {
...
@@ -51,9 +51,8 @@ input[type="checkbox"]:hover {
margin
:
-4px
4px
-4px
-4px
;
margin
:
-4px
4px
-4px
-4px
;
line-height
:
25px
;
line-height
:
25px
;
padding
:
4px
8px
;
padding
:
4px
8px
;
border-radius
:
2px
0
0
2px
;
border-radius
:
$border-radius-default
0
0
$border-radius-default
;
height
:
32px
;
transition
:
border-color
ease-in-out
$default-transition-duration
;
transition
:
border-color
ease-in-out
0
.15s
;
}
}
.search-input
{
.search-input
{
...
@@ -65,11 +64,11 @@ input[type="checkbox"]:hover {
...
@@ -65,11 +64,11 @@ input[type="checkbox"]:hover {
width
:
98%
;
width
:
98%
;
color
:
$white-light
;
color
:
$white-light
;
background
:
none
;
background
:
none
;
transition
:
color
ease-in-out
0
.15s
;
transition
:
color
ease-in-out
$default-transition-duration
;
}
}
.
search-input
:
:
placeholder
{
.
search-input
:
:
placeholder
{
transition
:
color
ease-in-out
0
.15s
;
transition
:
color
ease-in-out
$default-transition-duration
;
}
}
.search-input-container
{
.search-input-container
{
...
@@ -93,7 +92,7 @@ input[type="checkbox"]:hover {
...
@@ -93,7 +92,7 @@ input[type="checkbox"]:hover {
.search-icon
{
.search-icon
{
@extend
.fa-search
;
@extend
.fa-search
;
transition
:
color
0
.15s
;
transition
:
color
$default-transition-duration
;
-webkit-user-select
:
none
;
-webkit-user-select
:
none
;
-moz-user-select
:
none
;
-moz-user-select
:
none
;
-ms-user-select
:
none
;
-ms-user-select
:
none
;
...
@@ -146,13 +145,13 @@ input[type="checkbox"]:hover {
...
@@ -146,13 +145,13 @@ input[type="checkbox"]:hover {
.search-icon
,
.search-icon
,
.clear-icon
{
.clear-icon
{
color
:
$gl-text-color-tertiary
;
color
:
$gl-text-color-tertiary
;
transition
:
color
ease-in-out
0
.15s
;
transition
:
color
ease-in-out
$default-transition-duration
;
}
}
}
}
.search-input
{
.search-input
{
color
:
$gl-text-color
;
color
:
$gl-text-color
;
transition
:
color
ease-in-out
0
.15s
;
transition
:
color
ease-in-out
$default-transition-duration
;
}
}
.
search-input
:
:
placeholder
{
.
search-input
:
:
placeholder
{
...
@@ -161,7 +160,7 @@ input[type="checkbox"]:hover {
...
@@ -161,7 +160,7 @@ input[type="checkbox"]:hover {
}
}
.location-badge
{
.location-badge
{
transition
:
all
0
.15s
;
transition
:
all
$default-transition-duration
;
background-color
:
$nav-badge-bg
;
background-color
:
$nav-badge-bg
;
border-color
:
$border-color
;
border-color
:
$border-color
;
}
}
...
...
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