summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>2016-01-26 11:52:09 -0500
committerJacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>2016-01-26 11:52:09 -0500
commit9a1ec97fc47c7d621d3b3332a21c9c9be589ab79 (patch)
treefe1d9c21f2117dcdbb6440e4efdc2b0d82f3a9f5
parent111834883d287c89a24ae395900786d771214bdb (diff)
downloadgitlab-ce-9a1ec97fc47c7d621d3b3332a21c9c9be589ab79.tar.gz
Revert "Adjusts styles of table tree"
This reverts commit 111834883d287c89a24ae395900786d771214bdb.
-rw-r--r--app/assets/stylesheets/framework/buttons.scss7
-rw-r--r--app/assets/stylesheets/pages/tree.scss37
2 files changed, 10 insertions, 34 deletions
diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss
index 0e67e35b606..64854a67678 100644
--- a/app/assets/stylesheets/framework/buttons.scss
+++ b/app/assets/stylesheets/framework/buttons.scss
@@ -127,9 +127,6 @@
&.btn-xs {
margin-right: 3px;
}
- i {
- font-size: 11px;
- }
}
&.disabled {
pointer-events: auto !important;
@@ -193,4 +190,8 @@
.btn-green {
@include btn-green
}
+}
+
+.btn-icon {
+
} \ No newline at end of file
diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss
index ab12f2d55e0..4ff549ade1f 100644
--- a/app/assets/stylesheets/pages/tree.scss
+++ b/app/assets/stylesheets/pages/tree.scss
@@ -1,12 +1,6 @@
.tree-holder {
> .nav-block {
- margin: 22px 0 0 0;
- background: #F8FAFC;
- padding: 9px 9px 4px 14px;
- border: 1px solid #EBECF0;
- border-top-left-radius: 3px;
- border-top-right-radius: 3px;
- border-bottom-width: 0;
+ margin: 11px 0;
}
.file-finder {
@@ -19,18 +13,7 @@
.tree-table {
margin-bottom: 0;
- border: 1px solid #EEF0F2;
- thead {
- th {
- background-color: white;
-
- &:last-child {
- .light {
- color: #8C9AAC;
- }
- }
- }
- }
+
tr:nth-child(odd) {
background-color: #F7F9FB;
}
@@ -45,6 +28,8 @@
&:hover {
td {
background: $hover;
+ border-top: 1px solid #ADF;
+ border-bottom: 1px solid #ADF;
}
cursor: pointer;
}
@@ -63,14 +48,10 @@
max-width: 320px;
vertical-align: middle;
- a {
+ i, a {
color: $gl-link-color;
}
- i {
- color: #797B7D;
- }
-
img {
position: relative;
top:-1px;
@@ -79,16 +60,10 @@
.tree_commit {
max-width: 320px;
- a {
- color: #8C9AAC;
- }
}
.tree_time_ago {
min-width: 135px;
- time {
- color: #8C9AAC;
- }
}
}
@@ -154,5 +129,5 @@
.tree-controls {
float: right;
- margin: 32px 7px 0 0;
+ margin-top: 11px;
}