Modal dialogs have some transparency, less margins and whitespace (ad…

…dresses point 2 of issue evewspace#239)
proycon · Oct 14, 2016 · 1d8bd59 · 1d8bd59
1 parent 9db9387
commit 1d8bd59
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 14 deletions.
diff --git a/evewspace/Map/templates/edit_system.html b/evewspace/Map/templates/edit_system.html
@@ -15,7 +15,6 @@ <h4>Occupied: </h4>
         <label for="sysTypeRegular"><input type="radio" id="sysTypeRegular" class="editWormholeInput" name="importance" value="0" {% if mapsys.system.importance == 0 %} checked="checked" {% endif %}> Regular System </label>&nbsp;
         <label for="sysTypeDangerous"><input type="radio" id="sysTypeDangerous" class="editWormholeInput" name="importance" value="1" {% if mapsys.system.importance == 1 %} checked="checked" {% endif %}> Dangerous System </label>&nbsp;
         <label for="sysTypeImportant"><input type="radio" id="sysTypeImportant" class="editWormholeInput" name="importance" value="2" {% if mapsys.system.importance == 2 %} checked="checked" {% endif %}> Important System </label>
-        <br />
         <input type="submit" style="display: none;">
     </form>
 </div>

diff --git a/evewspace/Map/templates/edit_wormhole.html b/evewspace/Map/templates/edit_wormhole.html
@@ -21,20 +21,20 @@ <h4>Edit Wormhole Status</h4>
 		        <label for="massStatusReduced"><input id="massStatusReduced" type="radio" class="editWormholeInput" name="massStatus" value="1" {% if wormhole.mass_status == 1 %} checked="checked" {% endif %}> First Shrink</label> <br />
 		        <label for="massStatusCritical"><input id="massStatusCritical" type="radio" class="editWormholeInput" name="massStatus" value="2" {% if wormhole.mass_status == 2 %} checked="checked" {% endif %}> Critical</label>
 		    </div>
-		    <div style="padding-top: 30px" class="col-md-6 input-margin">
-        		<h4>Wormhole in: {{wormhole.top.system.name}}</h4>
+		    <div class="col-md-6 input-margin">
+                Wormhole in {{wormhole.top.system.name}}{% if mapsys.friendlyname %} <span class="friendlyname">({{ mapsys.friendlyname }})</span>{% endif %}:
         	</div>
-        	<div style="padding-top: 30px" class="col-md-6 input-margin">
+        	<div class="col-md-6 input-margin">
 		        Type: &nbsp;
 		        <input type="text" id="topType" class="editWormholeInput wormholeAuto input-sm form-control" name="topType" value="{{wormhole.top_type.name}}">
 		        <br />
 		        Bubbled: &nbsp; <input type="radio" class="editWormholeInput" name="topBubbled" value="0" {% if not wormhole.top_bubbled %} checked="checked" {% endif %}> No &nbsp;
 		        <input type="radio" class="editWormholeInput" name="topBubbled" value="1" {% if wormhole.top_bubbled %} checked="checked" {% endif %}> Yes
 		    </div>
-		    <div style="padding-top: 30px" class="col-md-6 input-margin">
-        		<h4>Wormhole in: {{wormhole.bottom.system.name}}</h4>
+		    <div class="col-md-6 input-margin">
+                Wormhole in {{wormhole.bottom.system.name}}{% if mapsys.friendlyname %} <span class="friendlyname">({{ mapsys.friendlyname }})</span>{% endif %}:
         	</div>
-        	<div style="padding-top: 30px" class="col-md-6 input-margin">
+        	<div class="col-md-6 input-margin">
 		        Type: &nbsp;
 		        <input type="text" id="bottomType" class="editWormholeInput wormholeAuto input-sm form-control" name="bottomType" value="{{wormhole.bottom_type.name}}">
 		        <br />

diff --git a/evewspace/core/static/bootstrap/css/bootstrap.css b/evewspace/core/static/bootstrap/css/bootstrap.css
@@ -256,8 +256,8 @@ th {
 }
 @font-face {
   font-family: 'Glyphicons Halflings';
-  src: url('.../fonts/glyphicons-halflings-regular.eot');
-  src: url('.../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff2') format('woff2'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
+  src: url('http://bootstrap-live-customizer.com/bootstrap-3.3.5/fonts/glyphicons-halflings-regular.eot');
+  src: url('http://bootstrap-live-customizer.com/bootstrap-3.3.5/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('http://bootstrap-live-customizer.com/bootstrap-3.3.5/fonts/glyphicons-halflings-regular.woff2') format('woff2'), url('http://bootstrap-live-customizer.com/bootstrap-3.3.5/fonts/glyphicons-halflings-regular.woff') format('woff'), url('http://bootstrap-live-customizer.com/bootstrap-3.3.5/fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('http://bootstrap-live-customizer.com/bootstrap-3.3.5/fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
 }
 .glyphicon {
   position: relative;

diff --git a/evewspace/core/static/bootstrap/css/bootstrap.min.css b/evewspace/core/static/bootstrap/css/bootstrap.min.css
@@ -52,7 +52,7 @@ h2,h3{page-break-after:avoid}
 }
 .img-thumbnail,body{background-color:#222}
 .btn,.btn-danger.active,.btn-danger:active,.btn-default.active,.btn-default:active,.btn-info.active,.btn-info:active,.btn-primary.active,.btn-primary:active,.btn-success.active,.btn-success:active,.btn-warning.active,.btn-warning:active,.btn.active,.btn:active,.form-control,.navbar-toggle,.open>.dropdown-toggle.btn-danger,.open>.dropdown-toggle.btn-default,.open>.dropdown-toggle.btn-info,.open>.dropdown-toggle.btn-primary,.open>.dropdown-toggle.btn-success,.open>.dropdown-toggle.btn-warning{background-image:none}
-@font-face{font-family:'Glyphicons Halflings';src:url(.../fonts/glyphicons-halflings-regular.eot);src:url(../fonts/glyphicons-halflings-regular.eot?#iefix) format('embedded-opentype'),url(../fonts/glyphicons-halflings-regular.woff2) format('woff2'),url(../fonts/glyphicons-halflings-regular.woff) format('woff'),url(../fonts/glyphicons-halflings-regular.ttf) format('truetype'),url(../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular) format('svg')}
+@font-face{font-family:'Glyphicons Halflings';src:url(http://bootstrap-live-customizer.com/bootstrap-3.3.5/fonts/glyphicons-halflings-regular.eot);src:url(http://bootstrap-live-customizer.com/bootstrap-3.3.5/fonts/glyphicons-halflings-regular.eot?#iefix) format('embedded-opentype'),url(http://bootstrap-live-customizer.com/bootstrap-3.3.5/fonts/glyphicons-halflings-regular.woff2) format('woff2'),url(http://bootstrap-live-customizer.com/bootstrap-3.3.5/fonts/glyphicons-halflings-regular.woff) format('woff'),url(http://bootstrap-live-customizer.com/bootstrap-3.3.5/fonts/glyphicons-halflings-regular.ttf) format('truetype'),url(http://bootstrap-live-customizer.com/bootstrap-3.3.5/fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular) format('svg')}
 .glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}
 .glyphicon-asterisk:before{content:"\2a"}
 .glyphicon-plus:before{content:"\2b"}

diff --git a/evewspace/core/static/bootstrap/css/template.less b/evewspace/core/static/bootstrap/css/template.less
@@ -75,8 +75,8 @@
 //
 //## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
 
-//** Loa../fonts from this directory.
-@icon-font-path:          "../fonts/";
+//** Load fonts from this directory.
+@icon-font-path:          "../fonts/";  //"http://bootstrap-live-customizer.com/bootstrap-3.3.5/fonts/";
 //** File name for all font files.
 @icon-font-name:          "glyphicons-halflings-regular";
 //** Element ID within SVG icon file.

diff --git a/evewspace/core/static/css/base.css b/evewspace/core/static/css/base.css
@@ -1,5 +1,5 @@
 .draggable-response-container {
-    background-color: #464545;
+    background-color: rgba(70,69,69,0.9);
     border: 1px solid #fff;
     border-radius: 5px;
     position: absolute;
@@ -39,4 +39,19 @@
 .center_text
 {
     text-align:center;
-}
+}
+
+
+/** 
+ * override some things from bootstrap.css
+ */
+
+.modal-header {
+    padding-top: 1px;
+    padding-bottom: 1px;
+}
+
+.modal-body {
+    padding-top: 1px;
+    padding-bottom: 1px;
+}