summaryrefslogtreecommitdiff
path: root/ishtar_common/static
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-01-24 19:30:37 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-01-24 19:30:37 +0100
commit0e9d38a6ed4dce4c23e6dfc59869d9d652e6dcfa (patch)
treebb897cb3054f188070b902c40375b0dbbefb343a /ishtar_common/static
parentf9cb0d2cc88fb022c1fb44c26c0696923277397a (diff)
parent136d69ad974a2beb94abb0b669d88054371ef57b (diff)
downloadIshtar-0e9d38a6ed4dce4c23e6dfc59869d9d652e6dcfa.tar.bz2
Ishtar-0e9d38a6ed4dce4c23e6dfc59869d9d652e6dcfa.zip
Merge branch 'master' into v0.9
Diffstat (limited to 'ishtar_common/static')
-rw-r--r--ishtar_common/static/media/style.css12
1 files changed, 9 insertions, 3 deletions
diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css
index b1939eaf0..6fe6e6532 100644
--- a/ishtar_common/static/media/style.css
+++ b/ishtar_common/static/media/style.css
@@ -358,7 +358,7 @@ div#header{
position: fixed;
top: 0;
z-index: 10;
- width:100%;
+ width: 500px;
text-align:left;
font-size: 0.9em;
background-color: #EAEAEA;
@@ -488,10 +488,16 @@ div#context_menu fieldset{
-webkit-border-radius: 0;
border-radius: 0;
position: fixed;
- top: 40px;
+ top: 8px;
right: 10px;
}
+@media screen and (max-width: 680px) {
+ div#context_menu fieldset{
+ display: none;
+ }
+}
+
div#action_current_items{
display: inline-block;
vertical-align: top;
@@ -605,7 +611,7 @@ div#welcome{
div#content{
clear:both;
- margin-top:205px ;
+ margin-top:225px ;
margin-bottom: 70px;
margin-left: 200px;
margin-right: 150px;