Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-01-30 00:57:15 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-01-30 00:57:15 +0400
commit7ba4f2dcfaa85fb89e15d9caa21bf75ad976389f (patch)
tree643aec9556852732085ad447cb6a9fa1ca0c314d /app
parentfb617c61b95aef4615346a5e554db469384d9b6c (diff)
few styling for buttons
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/gitlab_bootstrap/blocks.scss4
-rw-r--r--app/assets/stylesheets/gitlab_bootstrap/buttons.scss9
-rw-r--r--app/views/groups/new.html.haml2
-rw-r--r--app/views/teams/new.html.haml2
4 files changed, 12 insertions, 5 deletions
diff --git a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss
index 8cb1c045778..26681c65bf4 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss
@@ -98,6 +98,10 @@
margin-top: 3px;
}
+ .btn-tiny {
+ @include box-shadow(0 0px 0px 1px #f1f1f1);
+ }
+
.nav-pills {
> li {
> a {
diff --git a/app/assets/stylesheets/gitlab_bootstrap/buttons.scss b/app/assets/stylesheets/gitlab_bootstrap/buttons.scss
index 86b4c5b3b64..a20c9b1b31e 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/buttons.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/buttons.scss
@@ -1,9 +1,12 @@
.btn {
- @include linear-gradient(#f7f7f7, #d5d5d5);
+ @include linear-gradient(#f1f1f1, #e1e1e1);
+ text-shadow: 0 1px 1px #FFF;
border-color: #BBB;
+
&:hover {
- @include bg-gray-gradient;
- border-color: #bbb;
+ background: #f1f1f1;
+ @include linear-gradient(#fAfAfA, #f1f1f1);
+ border-color: #AAA;
color: #333;
}
diff --git a/app/views/groups/new.html.haml b/app/views/groups/new.html.haml
index 8fdedce95c9..224962df013 100644
--- a/app/views/groups/new.html.haml
+++ b/app/views/groups/new.html.haml
@@ -10,7 +10,7 @@
.input
= f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left"
&nbsp;
- = f.submit 'Create group', class: "btn btn-primary"
+ = f.submit 'Create group', class: "btn btn-create"
%hr
.padded
%ul
diff --git a/app/views/teams/new.html.haml b/app/views/teams/new.html.haml
index ca28f313e72..c0363fe39a8 100644
--- a/app/views/teams/new.html.haml
+++ b/app/views/teams/new.html.haml
@@ -10,7 +10,7 @@
.input
= f.text_field :name, placeholder: "Ex. Ruby Developers", class: "xxlarge left"
&nbsp;
- = f.submit 'Create team', class: "btn btn-primary"
+ = f.submit 'Create team', class: "btn btn-create"
%hr
.padded
%ul