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
diff options
context:
space:
mode:
authorrandx <dmitriy.zaporozhets@gmail.com>2012-10-23 00:37:50 +0400
committerrandx <dmitriy.zaporozhets@gmail.com>2012-10-23 00:37:50 +0400
commite51b2d58e7e751b62d1d924e3c494117fd9d0604 (patch)
tree9c6b65020aca3b120e1ef9c353a443c3ee491a51 /app/assets
parent42abdf69d59ecf28688af5994ff2e324c50a6d33 (diff)
Restyled last push widget. Increased line-height for td in tables
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/gitlab_bootstrap/buttons.scss16
-rw-r--r--app/assets/stylesheets/gitlab_bootstrap/tables.scss8
-rw-r--r--app/assets/stylesheets/sections/events.scss15
-rw-r--r--app/assets/stylesheets/sections/tree.scss1
4 files changed, 36 insertions, 4 deletions
diff --git a/app/assets/stylesheets/gitlab_bootstrap/buttons.scss b/app/assets/stylesheets/gitlab_bootstrap/buttons.scss
index 380fc3e3711..4f631a3e79a 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/buttons.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/buttons.scss
@@ -24,6 +24,22 @@
}
}
+ &.btn-info {
+ background:#5aB9C3;
+ border-color: $blue_link;
+ color:#fff;
+ text-shadow: 0 1px 1px #268;
+ &:hover {
+ background:$blue_link;
+ color:#fff;
+ }
+
+ &.disabled {
+ color:#fff;
+ background:#29B;
+ }
+ }
+
&.success {
@extend .btn-success;
diff --git a/app/assets/stylesheets/gitlab_bootstrap/tables.scss b/app/assets/stylesheets/gitlab_bootstrap/tables.scss
index b9220792b36..7a3bda2bff0 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/tables.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/tables.scss
@@ -5,6 +5,12 @@ table {
border:1px solid #bbb;
width:100%;
+ &.low {
+ td {
+ line-height:18px;
+ }
+ }
+
th {
font-weight: bold;
vertical-align: middle;
@@ -26,6 +32,8 @@ table {
td {
border-color:#f1f1f1;
+ line-height:28px;
+
&:first-child {
border-left:1px solid #bbb;
}
diff --git a/app/assets/stylesheets/sections/events.scss b/app/assets/stylesheets/sections/events.scss
index b7a482fd7a1..17df600c1af 100644
--- a/app/assets/stylesheets/sections/events.scss
+++ b/app/assets/stylesheets/sections/events.scss
@@ -97,14 +97,21 @@
*
*/
.event_lp {
- @extend .ui-box;
color:#777;
- margin-bottom:20px;
- padding:8px;
- @include border-radius(4px);
+ padding:10px;
min-height:22px;
+ border-left: 5px solid #5AB9C3;
+ margin-bottom:20px;
+ background:#f9f9f9;
.avatar {
width:24px;
}
+
+ .btn-new-mr {
+ @extend .btn-info;
+ @extend .small;
+ @extend .right;
+ margin: -3px;
+ }
}
diff --git a/app/assets/stylesheets/sections/tree.scss b/app/assets/stylesheets/sections/tree.scss
index 9f78a6b6ae3..e17487fdb2d 100644
--- a/app/assets/stylesheets/sections/tree.scss
+++ b/app/assets/stylesheets/sections/tree.scss
@@ -48,6 +48,7 @@
padding: 2px 10px;
}
td {
+ line-height:20px;
background:#fafafa;
}
}