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
Jérome Perrin
gitlab-ce
Commits
5a0ff297
Commit
5a0ff297
authored
Mar 23, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added web IDE to GitLab theme definition
Closes #44571
parent
b06a44c4
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
93 additions
and
34 deletions
+93
-34
app/assets/stylesheets/framework/gitlab_theme.scss
app/assets/stylesheets/framework/gitlab_theme.scss
+91
-18
app/assets/stylesheets/pages/repo.scss
app/assets/stylesheets/pages/repo.scss
+2
-16
No files found.
app/assets/stylesheets/framework/gitlab_theme.scss
View file @
5a0ff297
...
@@ -2,7 +2,15 @@
...
@@ -2,7 +2,15 @@
* Styles the GitLab application with a specific color theme
* Styles the GitLab application with a specific color theme
*/
*/
@mixin
gitlab-theme
(
$color-100
,
$color-200
,
$color-500
,
$color-700
,
$color-800
,
$color-900
,
$color-alternate
)
{
@mixin
gitlab-theme
(
$color-100
,
$color-200
,
$color-500
,
$color-700
,
$color-800
,
$color-900
,
$color-alternate
)
{
// Header
// Header
.navbar-gitlab
{
.navbar-gitlab
{
...
@@ -23,7 +31,7 @@
...
@@ -23,7 +31,7 @@
>
li
{
>
li
{
>
a
:hover
,
>
a
:hover
,
>
a
:focus
{
>
a
:focus
{
background-color
:
rgba
(
$color-200
,
.2
);
background-color
:
rgba
(
$color-200
,
0
.2
);
}
}
&
.active
>
a
,
&
.active
>
a
,
...
@@ -33,7 +41,7 @@
...
@@ -33,7 +41,7 @@
}
}
&
.line-separator
{
&
.line-separator
{
border-left
:
1px
solid
rgba
(
$color-200
,
.2
);
border-left
:
1px
solid
rgba
(
$color-200
,
0
.2
);
}
}
}
}
}
}
...
@@ -56,7 +64,7 @@
...
@@ -56,7 +64,7 @@
&
:hover
,
&
:hover
,
&
:focus
{
&
:focus
{
@media
(
min-width
:
$screen-sm-min
)
{
@media
(
min-width
:
$screen-sm-min
)
{
background-color
:
rgba
(
$color-200
,
.2
);
background-color
:
rgba
(
$color-200
,
0
.2
);
}
}
svg
{
svg
{
...
@@ -91,34 +99,34 @@
...
@@ -91,34 +99,34 @@
>
a
{
>
a
{
&
:hover
,
&
:hover
,
&
:focus
{
&
:focus
{
background-color
:
rgba
(
$color-200
,
.2
);
background-color
:
rgba
(
$color-200
,
0
.2
);
}
}
}
}
}
}
.search
{
.search
{
form
{
form
{
background-color
:
rgba
(
$color-200
,
.2
);
background-color
:
rgba
(
$color-200
,
0
.2
);
&
:hover
{
&
:hover
{
background-color
:
rgba
(
$color-200
,
.3
);
background-color
:
rgba
(
$color-200
,
0
.3
);
}
}
}
}
.location-badge
{
.location-badge
{
color
:
$color-100
;
color
:
$color-100
;
background-color
:
rgba
(
$color-200
,
.1
);
background-color
:
rgba
(
$color-200
,
0
.1
);
border-right
:
1px
solid
$color-800
;
border-right
:
1px
solid
$color-800
;
}
}
.
search-input
:
:
placeholder
{
.
search-input
:
:
placeholder
{
color
:
rgba
(
$color-200
,
.8
);
color
:
rgba
(
$color-200
,
0
.8
);
}
}
.search-input-wrap
{
.search-input-wrap
{
.search-icon
,
.search-icon
,
.clear-icon
{
.clear-icon
{
fill
:
rgba
(
$color-200
,
.8
);
fill
:
rgba
(
$color-200
,
0
.8
);
}
}
}
}
...
@@ -133,7 +141,7 @@
...
@@ -133,7 +141,7 @@
.search-input-wrap
{
.search-input-wrap
{
.search-icon
{
.search-icon
{
fill
:
rgba
(
$color-200
,
.8
);
fill
:
rgba
(
$color-200
,
0
.8
);
}
}
}
}
}
}
...
@@ -144,7 +152,6 @@
...
@@ -144,7 +152,6 @@
color
:
$color-900
;
color
:
$color-900
;
}
}
// Sidebar
// Sidebar
.nav-sidebar
li
.active
{
.nav-sidebar
li
.active
{
box-shadow
:
inset
4px
0
0
$color-700
;
box-shadow
:
inset
4px
0
0
$color-700
;
...
@@ -169,28 +176,90 @@
...
@@ -169,28 +176,90 @@
font-weight
:
$gl-font-weight-bold
;
font-weight
:
$gl-font-weight-bold
;
}
}
}
}
}
// Web IDE
.ide-sidebar-link
{
color
:
$color-200
;
background-color
:
$color-700
;
&
:hover
,
&
:focus
{
background-color
:
$color-500
;
}
&
:active
{
background
:
$color-800
;
}
}
.branch-container
{
border-left-color
:
$color-700
;
}
.branch-header-title
{
color
:
$color-700
;
}
}
body
{
body
{
&
.ui_indigo
{
&
.ui_indigo
{
@include
gitlab-theme
(
$indigo-100
,
$indigo-200
,
$indigo-500
,
$indigo-700
,
$indigo-800
,
$indigo-900
,
$white-light
);
@include
gitlab-theme
(
$indigo-100
,
$indigo-200
,
$indigo-500
,
$indigo-700
,
$indigo-800
,
$indigo-900
,
$white-light
);
}
}
&
.ui_dark
{
&
.ui_dark
{
@include
gitlab-theme
(
$theme-gray-100
,
$theme-gray-200
,
$theme-gray-500
,
$theme-gray-700
,
$theme-gray-800
,
$theme-gray-900
,
$white-light
);
@include
gitlab-theme
(
$theme-gray-100
,
$theme-gray-200
,
$theme-gray-500
,
$theme-gray-700
,
$theme-gray-800
,
$theme-gray-900
,
$white-light
);
}
}
&
.ui_blue
{
&
.ui_blue
{
@include
gitlab-theme
(
$theme-blue-100
,
$theme-blue-200
,
$theme-blue-500
,
$theme-blue-700
,
$theme-blue-800
,
$theme-blue-900
,
$white-light
);
@include
gitlab-theme
(
$theme-blue-100
,
$theme-blue-200
,
$theme-blue-500
,
$theme-blue-700
,
$theme-blue-800
,
$theme-blue-900
,
$white-light
);
}
}
&
.ui_green
{
&
.ui_green
{
@include
gitlab-theme
(
$theme-green-100
,
$theme-green-200
,
$theme-green-500
,
$theme-green-700
,
$theme-green-800
,
$theme-green-900
,
$white-light
);
@include
gitlab-theme
(
$theme-green-100
,
$theme-green-200
,
$theme-green-500
,
$theme-green-700
,
$theme-green-800
,
$theme-green-900
,
$white-light
);
}
}
&
.ui_light
{
&
.ui_light
{
@include
gitlab-theme
(
$theme-gray-900
,
$theme-gray-700
,
$theme-gray-800
,
$theme-gray-700
,
$theme-gray-700
,
$theme-gray-100
,
$theme-gray-700
);
@include
gitlab-theme
(
$theme-gray-900
,
$theme-gray-700
,
$theme-gray-800
,
$theme-gray-700
,
$theme-gray-700
,
$theme-gray-100
,
$theme-gray-700
);
.navbar-gitlab
{
.navbar-gitlab
{
background-color
:
$theme-gray-100
;
background-color
:
$theme-gray-100
;
...
@@ -270,5 +339,9 @@ body {
...
@@ -270,5 +339,9 @@ body {
.sidebar-top-level-items
>
li
.active
.badge
{
.sidebar-top-level-items
>
li
.active
.badge
{
color
:
$theme-gray-900
;
color
:
$theme-gray-900
;
}
}
.ide-sidebar-link
{
color
:
$white-light
;
}
}
}
}
}
app/assets/stylesheets/pages/repo.scss
View file @
5a0ff297
...
@@ -398,7 +398,7 @@
...
@@ -398,7 +398,7 @@
}
}
.branch-container
{
.branch-container
{
border-left
:
4px
solid
$indigo-700
;
border-left
:
4px
solid
;
margin-bottom
:
$gl-bar-padding
;
margin-bottom
:
$gl-bar-padding
;
}
}
...
@@ -410,7 +410,6 @@
...
@@ -410,7 +410,6 @@
.branch-header-title
{
.branch-header-title
{
flex
:
1
;
flex
:
1
;
padding
:
$grid-size
$gl-padding
;
padding
:
$grid-size
$gl-padding
;
color
:
$indigo-700
;
font-weight
:
$gl-font-weight-bold
;
font-weight
:
$gl-font-weight-bold
;
svg
{
svg
{
...
@@ -763,20 +762,7 @@
...
@@ -763,20 +762,7 @@
.ide-sidebar-link
{
.ide-sidebar-link
{
padding
:
$gl-padding-8
$gl-padding
;
padding
:
$gl-padding-8
$gl-padding
;
background
:
$indigo-700
;
color
:
$white-light
;
text-decoration
:
none
;
display
:
flex
;
display
:
flex
;
align-items
:
center
;
align-items
:
center
;
font-weight
:
$gl-font-weight-bold
;
&
:focus
,
&
:hover
{
color
:
$white-light
;
text-decoration
:
underline
;
background
:
$indigo-500
;
}
&
:active
{
background
:
$indigo-800
;
}
}
}
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