summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-03-02 10:16:51 +0000
committerRobert Speicher <rspeicher@gmail.com>2016-03-03 16:13:56 -0500
commit034ad4e20119fda5821d101aac841315da781277 (patch)
tree7e9b5aa24e875f0394a0d0da2824146711e784a9 /app
parent36aad293b992e999b77e7145f0c6f36b7b02eaeb (diff)
downloadgitlab-ce-034ad4e20119fda5821d101aac841315da781277.tar.gz
Content link colour in profile settings
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/framework/variables.scss3
-rw-r--r--app/assets/stylesheets/pages/profile.scss10
-rw-r--r--app/views/profiles/keys/index.html.haml2
3 files changed, 12 insertions, 3 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 375726d7191..6fc62f7f201 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -38,6 +38,9 @@ $profile-settings-link-color: $md-link-color;
$btn-transparent-color: #8F8F8F;
+$ssh-key-icon-color: #8F8F8F;
+$ssh-key-icon-size: 18px;
+
/*
* Color schema
*/
diff --git a/app/assets/stylesheets/pages/profile.scss b/app/assets/stylesheets/pages/profile.scss
index 6ac69cf412e..83798ec238c 100644
--- a/app/assets/stylesheets/pages/profile.scss
+++ b/app/assets/stylesheets/pages/profile.scss
@@ -147,11 +147,17 @@
}
.key-icon {
- color: #8F8F8F;
- font-size: 18px;
+ color: $ssh-key-icon-color;
+ font-size: $ssh-key-icon-size;
line-height: 42px;
}
.key-created-at {
line-height: 42px;
}
+
+.profile-settings-content {
+ a {
+ color: $gl-primary;
+ }
+}
diff --git a/app/views/profiles/keys/index.html.haml b/app/views/profiles/keys/index.html.haml
index c6f0033a689..127c4a5b102 100644
--- a/app/views/profiles/keys/index.html.haml
+++ b/app/views/profiles/keys/index.html.haml
@@ -11,7 +11,7 @@
.col-lg-9
%h5.prepend-top-0
Add an SSH key
- %p
+ %p.profile-settings-content
Before you can add an SSH key you need to
= link_to "generate it.", help_page_path("ssh", "README")
= render 'form'