More responsive design + more flat design

5 files changed, 53 insertions, 28 deletions

diff --git a/ishtar_common/static/media/images/ishtar-bg.jpg b/ishtar_common/static/media/images/ishtar-bg.jpg
index f7802c576..fb0ca8d60 100644
--- a/ishtar_common/static/media/images/ishtar-bg.jpg
+++ b/ishtar_common/static/media/images/ishtar-bg.jpg
diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css
index 42d953833..46ee8c331 100644
--- a/ishtar_common/static/media/style.css
+++ b/ishtar_common/static/media/style.css
@@ -67,15 +67,20 @@ div.form {
 
 /* radius */
 a.button,
-a.add-button, a.remove,
-.sheet,
-#progress-content,
-div.form {
+a.add-button, a.remove {
     -moz-border-radius:4px;
     -webkit-border-radius:4px;
     border-radius:4px;
 }
 
+.sheet,
+#progress-content,
+div.form {
+    -moz-border-radius: 0;
+    -webkit-border-radius: 0;
+    border-radius: 0;
+}
+
 body{
     font-family:Arial, Helvetica, sans-serif;
     font-size: 11pt;
@@ -83,7 +88,7 @@ body{
     color:#61615C;
     background-image:url(images/ishtar-bg.jpg);
     background-repeat:no-repeat;
-    background-position:right top;
+    background-position:right 90px;
 }
 
 a {
@@ -235,7 +240,7 @@ div#header{
 div#logo{
     width:200px;
     top:40px;
-    left:30px;
+    left:10px;
     padding-top:90px;
     position:absolute;
     text-align:center;
@@ -288,6 +293,12 @@ div#language_form_div{
     padding:2px 20px;
 }
 
+#language_selector{
+    border-radius: 0;
+    background-color: #fff;
+    border-width: 0;
+}
+
 /*
 div#language_form_div label{
     display:inline;
@@ -295,16 +306,18 @@ div#language_form_div label{
 
 div#context_menu{
     height:110px;
-    float:right;
     margin-right:10px;
+    z-index: 1000;
+    position: absolute;
+    right: 0;
 }
 
 div#context_menu fieldset{
     background-color:#f1f2f6;
     border:0 solid #CCC;
-    -moz-border-radius:4px;
-    -webkit-border-radius:4px;
-    border-radius:4px;
+    -moz-border-radius: 0;
+    -webkit-border-radius: 0;
+    border-radius: 0;
 }
 
 div#context_menu ul{
@@ -348,9 +361,9 @@ div#main_menu > ul{
 div#main_menu > ul > li{
     padding:0.5em;
     margin:0 0.5em;
-    border-radius:4px;
-    -moz-border-radius:4px;
-    -webkit-border-radius:4px;
+    border-radius:0;
+    -moz-border-radius:0;
+    -webkit-border-radius:0;
 }
 
 #section-file_management, #section-administration,
@@ -394,10 +407,16 @@ div#main_menu > ul > li{
 
 div#content{
     clear:both;
-    margin:0 200px 70px 200px;
+    margin:190px 200px 70px 200px;
     text-align:center;
 }
 
+@media screen and (max-width: 1050px) {
+    div#content{
+        margin-right:0px;
+    }
+}
+
 ul#form_path, ul#form_path li{
     list-style-type:none;
     padding:0;
@@ -449,11 +468,13 @@ ul#form_path li a:link, ul#form_path li a:visited {
     padding:0.4em;
     margin-right:10px;
     border:1px solid #CCC;
-    -moz-border-radius:8px;
-    -webkit-border-radius:8px;
-    border-radius:8px;
+    -moz-border-radius:0;
+    -webkit-border-radius:0;
+    border-radius:0;
     background-color:white;
-    float:right;
+    position: absolute;
+    z-index:1000;
+    left: 200px;
 }
 
 #reminder p{
@@ -474,7 +495,6 @@ div.form {
     margin-bottom:40px;
     padding:20px;
     display:block;
-    width:720px;
     text-align:center;
 }
 
@@ -614,13 +634,13 @@ table.confirm tr.spacer td:last-child{
 }
 
 .sheet{
-    width:760px;
+    width:90%;
     position:fixed;
     height:90%;
     background: #FFF;
     z-index: 2000;
-    left: 50%;
-    margin-left: -380px;
+    /*left: 50%;*/
+    margin-left: 5%;
     -webkit-box-shadow: 0px 0px 20px #444;
     -moz-box-shadow: 0px 0px 20px #444;
     text-align: left;
@@ -715,6 +735,7 @@ table.confirm tr.spacer td:last-child{
 #window table.simple, .dashboard table.resume{
     font-size:0.9em;
     margin:10px 0;
+    padding: 0 10px;
     border-collapse:collapse;
     width:100%;
 }
@@ -817,7 +838,8 @@ table.confirm tr.spacer td:last-child{
     overflow:auto;
     top:38px;
     bottom:10px;
-    width:740px;
+    width:100%;
+    padding:0;
 }
 
 #window h1{
@@ -846,7 +868,8 @@ table.confirm tr.spacer td:last-child{
 }
 
 #window p{
-    margin:0.3em;
+    padding:0 10px;
+    margin:4px;
 }
 
 p.info-box, p.alert{
diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html
index f6b4cd414..578b3edcc 100644
--- a/ishtar_common/templates/base.html
+++ b/ishtar_common/templates/base.html
@@ -62,7 +62,7 @@
     <div id="logo">
 {% if APP_NAME %}<p id="app_name">{{APP_NAME}}</p>{%endif%}
     </div>
-    <div id="context_menu">
+    {% if not reminders %}<div id="context_menu">
         {% block context %}{% if current_menu %}
         <form method="post" action="{% url 'update-current-item' %}">
         <fieldset>
@@ -85,7 +85,7 @@
         </fieldset>
         </form>
         {% endif %}{% endblock %}
-    </div>
+    </div>{% endif %}
 {% if reminders %}<fieldset id='reminder'><legend>{% trans "Current items" %}</legend>
 {% for lbl, value in reminders%}
 <p><strong class='lbl'>{{lbl}}{% trans ":"%}</strong> <span class='value'>{{value}}</span></p>
diff --git a/ishtar_common/templates/blocks/JQueryJqGrid.html b/ishtar_common/templates/blocks/JQueryJqGrid.html
index 103a569e5..7e7086738 100644
--- a/ishtar_common/templates/blocks/JQueryJqGrid.html
+++ b/ishtar_common/templates/blocks/JQueryJqGrid.html
@@ -79,7 +79,8 @@ jQuery(document).ready(function(){
     emptyrecords: "{{no_result}}",
     loadtext: "{{loading}}",
     pager: '#pager_{{name}}',
-    width:740,
+    width: null,
+    shrinkToFit: false,
     rowNum:20,
     jsonReader : {repeatitems: false},
     loadError: function (jqXHR, textStatus, errorThrown) {
diff --git a/ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html b/ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html
index 27e1d3f82..76172d3ac 100644
--- a/ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html
+++ b/ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html
@@ -34,7 +34,8 @@ setTimeout(
         emptyrecords: "{{no_result}}",
         loadtext: "{{loading}}",
         pager: '#pager_{{name}}',
-        width:720,
+        width: null,
+        shrinkToFit: false,
         rowNum:20,
         jsonReader : {repeatitems: false},
         loadError: function (jqXHR, textStatus, errorThrown) {