summaryrefslogtreecommitdiff
path: root/res/client/css/partials
diff options
context:
space:
mode:
authorgarbash <dor.garbash@gmail.com>2015-04-05 12:05:14 +0300
committergarbash <dor.garbash@gmail.com>2015-04-05 12:05:18 +0300
commit6f6e43f63952eac5eb1f603631b37988d1e68cdf (patch)
tree44f6ff272d403eed4c00ff2ca218ace9606fa496 /res/client/css/partials
parentd5525ed6c217023ff706d70613b2fade4a9587bf (diff)
Toolbar icons are now text labels
Diffstat (limited to 'res/client/css/partials')
-rw-r--r--res/client/css/partials/buttons.scss2
-rw-r--r--res/client/css/partials/layout-buttons.scss11
-rw-r--r--res/client/css/partials/tool-bar.scss35
3 files changed, 17 insertions, 31 deletions
diff --git a/res/client/css/partials/buttons.scss b/res/client/css/partials/buttons.scss
index 6ac0b834..3c6263de 100644
--- a/res/client/css/partials/buttons.scss
+++ b/res/client/css/partials/buttons.scss
@@ -55,3 +55,5 @@
background-size: $icon-width;
width: 32px;
}
+
+
diff --git a/res/client/css/partials/layout-buttons.scss b/res/client/css/partials/layout-buttons.scss
deleted file mode 100644
index bb626d45..00000000
--- a/res/client/css/partials/layout-buttons.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-.btn_layout {
- background-color: white;
- border: 1px solid black;
- display: inline-block;
- font-size: $h5-size;
- margin-top: 5px;
- position: relative;
- top: 36px;
- text-align: center;
- width: 64px;
-}
diff --git a/res/client/css/partials/tool-bar.scss b/res/client/css/partials/tool-bar.scss
index 54fb3a19..2543821f 100644
--- a/res/client/css/partials/tool-bar.scss
+++ b/res/client/css/partials/tool-bar.scss
@@ -6,7 +6,7 @@
line-height: $three-baselines;
margin-left: 10px;
text-align: center;
- width: 50px;
+ width: $toolbar-button-width;
}
#tool-bar {
@@ -31,20 +31,9 @@
background-repeat: no-repeat;
}
-#btn_filter {
- background: url(../img/toolbar_icon__filter.png);
- background-repeat: no-repeat;
- background-position: center;
-}
-
#btn_layout {
- background: url(../img/btn_graph-layout.png);
- background-repeat: no-repeat;
- background-position: center;
- background-size: 48px;
-
&:after {
- bottom: 12px;
+ bottom: 10px;
border-top: 5px solid transparent;
border-left: 5px solid transparent;
border-bottom: 5px solid black;
@@ -52,21 +41,27 @@
content: ' ';
height: 0;
position: absolute;
- right: 65px;
+ margin-left: 0px;
width: 0;
}
}
#btn_merge {
- width: 80px;
+ width: $toolbar-button-width;
}
#btn_delete {
- width: 80px;
+ width: $toolbar-button-width;
}
-#btn_link_fan {
- background: url(../img/url-icon.png);
- background-position: center;
- background-repeat: no-repeat;
+.btn_layout {
+ background-color: white;
+ border: 1px solid black;
+ display: inline-block;
+ font-size: $h5-size;
+ margin-top: 5px;
+ position: relative;
+ text-align: center;
+ width: $toolbar-button-width;
+ right: 1px;
} \ No newline at end of file