Commits

James Taylor committed b70fa48

adding modals-size patch

Comments (0)

Files changed (3)

iOS-scroll-fix

-# HG changeset patch
-# Parent 33750f347be2aef72fe4e32d5c2197dd82f2b45a
-diff -r 33750f347be2 -r e4d63895400d templates/root/index.mako
---- a/templates/root/index.mako	Fri Jan 04 14:26:22 2013 -0500
-+++ b/templates/root/index.mako	Fri Jan 04 14:26:37 2013 -0500
-@@ -71,6 +71,15 @@
-                 galaxy_main.location = "${h.url_for( controller='history', action='import_archive' )}";
-             }
-         });
-+
-+        // Fix iFrame scrolling on iOS
-+        if( navigator.userAgent.match( /(iPhone|iPod|iPad)/i ) ) {
-+            $("iframe").parent().css( {
-+                "overflow": "scroll",
-+                "-webkit-overflow-scrolling": "touch",
-+            })
-+        }
-+
-     });
-     </script>
- </%def>
-@@ -118,7 +127,9 @@
-         center_url = h.url_for( '/static/welcome.html' )
-     %>
-     
--    <iframe name="galaxy_main" id="galaxy_main" frameborder="0" style="position: absolute; width: 100%; height: 100%;" src="${center_url}"></iframe>
-+    <div style="position: absolute; width: 100%; height: 100%">
-+        <iframe name="galaxy_main" id="galaxy_main" frameborder="0" style="position: absolute; width: 100%; height: 100%;" src="${center_url}"></iframe>
-+    </div>
- 
- </%def>
- 
+# HG changeset patch
+# Parent be7625f376d16cefa2fb4984fa6483f37b4b71d4
+modals: make wider by default and scroll like trello
+
+diff -r be7625f376d1 static/june_2007_style/base.less
+--- a/static/june_2007_style/base.less	Fri Jan 11 14:49:24 2013 -0500
++++ b/static/june_2007_style/base.less	Mon Jan 14 15:51:14 2013 -0500
+@@ -311,9 +311,10 @@
+ }
+ 
+ #overlay {
+-    position: fixed;
++    position: absolute;
+     top: 0; left: 0; width: 100%; height: 100%;
+     z-index: 20000;
++    overflow-y: auto;
+ }
+ 
+ #overlay.is_modal #overlay-background, .overlay-background {
+diff -r be7625f376d1 static/june_2007_style/blue/base.css
+--- a/static/june_2007_style/blue/base.css	Fri Jan 11 14:49:24 2013 -0500
++++ b/static/june_2007_style/blue/base.css	Mon Jan 14 15:51:14 2013 -0500
+@@ -537,6 +537,9 @@
+ .btn.active,.btn:active{color:inherit;}
+ .dropdown-menu{max-width:auto;}
+ input[type="checkbox"],input[type="radio"]{margin-left:0.5ex;margin-right:0.5ex;}
++.modal{position:absolute;top:50px;width:660px;margin-left:-330px;}
++.modal:after{content:"";height:0px;position:relative;top:50px;display:block;border:solid transparent 1px;}
++.modal-body{height:auto;max-height:none;}
+ .nav-tabs{border-bottom:1px solid #999999;}
+ .nav-tabs>li>a:hover{border-color:#eeeeee #eeeeee #999999;}
+ .nav-tabs>.active>a,.nav-tabs>.active>a:hover{border:1px solid #999999;border-bottom-color:transparent;}
+@@ -865,7 +868,7 @@
+ .panel-header-button{color:#333;text-decoration:none;display:inline-block;cursor:pointer;margin:-1px;padding:1px;margin-top:-0.2em;padding-right:0.5em;padding-left:0.5em;}.panel-header-button:hover{color:maroon;-webkit-transition:color 0.25s linear;-moz-transition:color 0.25s linear;-o-transition:color 0.25s linear;transition:color 0.25s linear;}
+ .panel-header-button .caret{margin-top:7px;}
+ .panel-header-button.popup{padding-right:1.75em;background:url(../images/dropdownarrow.png) no-repeat right 7px;}
+-#overlay{position:fixed;top:0;left:0;width:100%;height:100%;z-index:20000;}
++#overlay{position:absolute;top:0;left:0;width:100%;height:100%;z-index:20000;overflow-y:auto;}
+ #overlay.is_modal #overlay-background,.overlay-background{background:rgba(0, 0, 0, 0.5);}
+ .panel-error-message,.panel-warning-message,.panel-done-message,.panel-info-message{height:24px;line-height:24px;color:#303030;padding:0px;padding-left:26px;background-color:#ffcccc;background-image:url(error_small.png);background-repeat:no-repeat;background-position:6px 50%;}
+ .panel-warning-message{background-image:url(warn_small.png);background-color:#ffffcc;}
+diff -r be7625f376d1 static/june_2007_style/galaxy_bootstrap.less
+--- a/static/june_2007_style/galaxy_bootstrap.less	Fri Jan 11 14:49:24 2013 -0500
++++ b/static/june_2007_style/galaxy_bootstrap.less	Mon Jan 14 15:51:14 2013 -0500
+@@ -98,6 +98,31 @@
+     margin-right: 0.5ex;
+ }
+ 
++// Modal -- wider by default, scroll like Trello
++
++.modal { 
++  position: absolute;
++  top: 50px;
++  width: 660px;
++  margin-left: -330px;
++}
++
++
++.modal:after {
++  content: "";
++  height: 0px;
++  position: relative;
++  top: 50px;
++  display: block;
++  border: solid transparent 1px;
++};
++
++
++.modal-body {
++  height: auto;
++  max-height: none;
++}
++
+ // Tabs -- border color is hardcoded in navs.less, change to @btnBorder here
+ 
+ .nav-tabs {
-iOS-scroll-fix
+modals-size
 select2-for-big-selects
 weberror-paste-upgrades