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
Kazuhiko Shiozaki
gitlab-ce
Commits
c9b62662
Commit
c9b62662
authored
Mar 04, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Used standard variable colours
parent
a9d97838
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
14 deletions
+4
-14
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+0
-10
app/assets/stylesheets/pages/profile.scss
app/assets/stylesheets/pages/profile.scss
+4
-4
No files found.
app/assets/stylesheets/framework/variables.scss
View file @
c9b62662
...
@@ -34,16 +34,12 @@ $error-exclamation-point: #E62958;
...
@@ -34,16 +34,12 @@ $error-exclamation-point: #E62958;
$border-radius-default
:
3px
;
$border-radius-default
:
3px
;
$list-title-color
:
#333333
;
$list-title-color
:
#333333
;
$list-text-color
:
#555555
;
$list-text-color
:
#555555
;
$profile-settings-link-color
:
$md-link-color
;
$btn-transparent-color
:
#8F8F8F
;
$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-group-border
:
#E5E5E5
;
$provider-btn-not-active-color
:
#4688F1
;
$provider-btn-not-active-color
:
#4688F1
;
...
@@ -104,14 +100,8 @@ $border-red-light: #F24F41;
...
@@ -104,14 +100,8 @@ $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 @
c9b62662
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
.account-btn-link
,
.account-btn-link
,
.profile-settings-sidebar
a
{
.profile-settings-sidebar
a
{
color
:
$
profile-settings
-link-color
;
color
:
$
md
-link-color
;
}
}
.oauth-buttons
{
.oauth-buttons
{
...
@@ -171,16 +171,16 @@
...
@@ -171,16 +171,16 @@
.profile-settings-content
{
.profile-settings-content
{
a
{
a
{
color
:
$
profile-settings
-link-color
;
color
:
$
md
-link-color
;
}
}
}
}
.change-username-title
{
.change-username-title
{
color
:
$
change-username-title-color
;
color
:
$
gl-warning
;
}
}
.remove-account-title
{
.remove-account-title
{
color
:
$
remove-account-title-colo
r
;
color
:
$
gl-dange
r
;
}
}
.provider-btn-group
{
.provider-btn-group
{
...
...
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