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
4d457326
Commit
4d457326
authored
Mar 02, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed heading weight issue
Moved colours to variables
parent
9dc71dca
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
5 deletions
+17
-5
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+12
-0
app/assets/stylesheets/pages/profile.scss
app/assets/stylesheets/pages/profile.scss
+5
-5
No files found.
app/assets/stylesheets/framework/variables.scss
View file @
4d457326
...
@@ -41,6 +41,12 @@ $btn-transparent-color: #8F8F8F;
...
@@ -41,6 +41,12 @@ $btn-transparent-color: #8F8F8F;
$ssh-key-icon-color
:
#8F8F8F
;
$ssh-key-icon-color
:
#8F8F8F
;
$ssh-key-icon-size
:
18px
;
$ssh-key-icon-size
:
18px
;
$change-username-title-color
:
#FC6D26
;
$remove-account-title-color
:
#F00
;
$provider-btn-group-border
:
#E5E5E5
;
$provider-btn-not-active-color
:
#4688F1
;
/*
/*
* Color schema
* Color schema
*/
*/
...
@@ -98,8 +104,14 @@ $border-red-light: #F24F41;
...
@@ -98,8 +104,14 @@ $border-red-light: #F24F41;
$border-red-normal
:
#D22852
;
$border-red-normal
:
#D22852
;
$border-red-dark
:
#CA264F
;
$border-red-dark
:
#CA264F
;
<<<<<<<
454832ace49f1b1742b380441817663051ba8ac8
$
help-well-bg
:
#FAFAFA
;
$
help-well-bg
:
#FAFAFA
;
$help-well-border
:
#E5E5E5
;
$help-well-border
:
#E5E5E5
;
=======
$
account-well-bg
:
#FAFAFA
;
$account-well-border
:
#E5E5E5
;
$account-well-radius
:
3px
;
>>>>>>>
Fixed
heading
weight
issue
/*
header
*/
/*
header
*/
$
light-grey-header
:
#faf9f9
;
$
light-grey-header
:
#faf9f9
;
...
...
app/assets/stylesheets/pages/profile.scss
View file @
4d457326
...
@@ -176,17 +176,17 @@
...
@@ -176,17 +176,17 @@
}
}
.change-username-title
{
.change-username-title
{
color
:
#FC6D26
;
color
:
$change-username-title-color
;
}
}
.remove-account-title
{
.remove-account-title
{
color
:
#F00
;
color
:
$remove-account-title-color
;
}
}
.provider-btn-group
{
.provider-btn-group
{
display
:
inline-block
;
display
:
inline-block
;
margin-right
:
10px
;
margin-right
:
10px
;
border
:
1px
solid
#E5E5E5
;
border
:
1px
solid
$provider-btn-group-border
;
border-radius
:
3px
;
border-radius
:
3px
;
&
:last-child
{
&
:last-child
{
...
@@ -197,7 +197,7 @@
...
@@ -197,7 +197,7 @@
.provider-btn-image
{
.provider-btn-image
{
display
:
inline-block
;
display
:
inline-block
;
padding
:
5px
10px
;
padding
:
5px
10px
;
border-right
:
1px
solid
#E5E5E5
;
border-right
:
1px
solid
$provider-btn-group-border
;
>
img
{
>
img
{
width
:
20px
;
width
:
20px
;
...
@@ -212,6 +212,6 @@
...
@@ -212,6 +212,6 @@
background-color
:
$gray-light
;
background-color
:
$gray-light
;
&
.not-active
{
&
.not-active
{
color
:
#4688F1
;
color
:
$provider-btn-not-active-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