commit/galaxy-central: guerler: Remove galaxy.master.css and integrate style def into base.less
1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/8bcdf94c187a/ Changeset: 8bcdf94c187a User: guerler Date: 2013-09-12 17:57:37 Summary: Remove galaxy.master.css and integrate style def into base.less Affected #: 7 files diff -r ea0c57f1cdf0c17906bda3455ca0201972eb87c9 -r 8bcdf94c187a717731d714d9e7c64e747966ed36 static/scripts/galaxy.frame.js --- a/static/scripts/galaxy.frame.js +++ b/static/scripts/galaxy.frame.js @@ -37,7 +37,7 @@ top_min: 40, // maximum number of frames - frame_max: 10 + frame_max: 9 }, // number of columns @@ -800,7 +800,7 @@ } // check for number of frames - if (this.frame_counter > this.options.frame_max) + if (this.frame_counter >= this.options.frame_max) { alert("You have reached the maximum number of allowed frames (" + this.options.frame_max + ")."); return; diff -r ea0c57f1cdf0c17906bda3455ca0201972eb87c9 -r 8bcdf94c187a717731d714d9e7c64e747966ed36 static/scripts/galaxy.master.js --- a/static/scripts/galaxy.master.js +++ b/static/scripts/galaxy.master.js @@ -3,20 +3,17 @@ */ // dependencies -define(["utils/galaxy.css", "libs/backbone/backbone-relational"], function(css) { +define(["libs/backbone/backbone-relational"], function() { // master var GalaxyMaster = Backbone.View.extend( { // base element - el_master: '.masthead-inner', + el_master: '#masthead', // initialize initialize : function(options) { - // load required css files - css.load_file("static/style/galaxy.master.css"); - // define this element this.setElement($(this.template())); @@ -49,7 +46,7 @@ // fill regular modal template template: function() { - return '<div id="galaxy-master" class="galaxy-master"></div>'; + return '<div class="iconbar"></div>'; } }); @@ -113,13 +110,13 @@ // toggle toggle: function() { - $(this.el).addClass('galaxy-toggle'); + $(this.el).addClass('toggle'); }, // untoggle untoggle: function() { - $(this.el).removeClass('galaxy-toggle'); + $(this.el).removeClass('toggle'); }, // set/get number @@ -131,10 +128,10 @@ // fill template icon template: function (options) { - var tmpl = '<div id=' + options.id + ' class="galaxy-icon galaxy-corner">' + + var tmpl = '<div id=' + options.id + ' class="symbol">' + '<div class="icon fa-icon-2x ' + options.icon + '"></div>'; if (options.with_number) - tmpl+= '<div class="number galaxy-corner"></div>'; + tmpl+= '<div class="number"></div>'; tmpl += '</div>'; // return template diff -r ea0c57f1cdf0c17906bda3455ca0201972eb87c9 -r 8bcdf94c187a717731d714d9e7c64e747966ed36 static/scripts/galaxy.modal.js --- a/static/scripts/galaxy.modal.js +++ b/static/scripts/galaxy.modal.js @@ -3,7 +3,7 @@ */ // dependencies -define(["utils/galaxy.css", "libs/backbone/backbone-relational"], function(css) { +define(["libs/backbone/backbone-relational"], function() { // frame manager var GalaxyModal = Backbone.View.extend( @@ -21,6 +21,40 @@ // initialize initialize : function(options) { + // create + if (options) + { + this.create(options); + + // hide + $(this.el).hide(); + } + }, + + // adds and displays a new frame/window + show: function(options) + { + // create + if (options) + this.create(options); + + // fade out + this.$el.fadeIn('fast'); + }, + + // hide modal + hide: function() + { + // fade out + this.$el.fadeOut('fast'); + }, + + // destroy modal + create: function (options) + { + // remove element + this.$el.remove(); + // read in defaults if (!options) options = this.options; @@ -48,47 +82,6 @@ } else // default close button footer.append($('<button></button>').text('Close').click(function() { self.hide() })).append(" "); - - // hide - $(this.el).hide(); - }, - - /* - EVENT HANDLING - */ - - // event - events: - { - 'mousedown .dialog' : 'event_default', - 'mousedown .background' : 'hide' - }, - - // drag - event_default: function (e) - { - e.preventDefault(); - }, - - // adds and displays a new frame/window - show: function() - { - // fade out - this.$el.fadeIn('fast'); - }, - - // hide modal - hide: function() - { - // fade out - this.$el.fadeOut('fast'); - }, - - // destroy modal - destroy: function () - { - // remove element - this.$el.remove(); }, /* diff -r ea0c57f1cdf0c17906bda3455ca0201972eb87c9 -r 8bcdf94c187a717731d714d9e7c64e747966ed36 static/style/blue/base.css --- a/static/style/blue/base.css +++ b/static/style/blue/base.css @@ -1145,11 +1145,14 @@ .panel-warning-message{background-image:url(warn_small.png);background-color:#fce1ba} .panel-done-message{background-image:url(ok_small.png);background-color:#aff1af} .panel-info-message{background-image:url(info_small.png);background-color:#a6e4f7} -#masthead{position:absolute;top:0;left:0;width:100%;min-width:900px;padding:0}#masthead .nav{z-index:15001} +#masthead{position:absolute;top:0;left:0;width:100%;min-width:920px;padding:0}#masthead .nav{z-index:15001} #masthead .nav>li>a{cursor:pointer;text-decoration:none}#masthead .nav>li>a:hover{color:gold} #masthead li.dropdown>a:hover .caret{border-top-color:gold;border-bottom-color:gold} #masthead .navbar-brand{position:absolute;left:0;top:0;font-family:verdana;font-weight:bold;font-size:20px;line-height:1;color:white;padding:5px 20px 12px;margin-left:-15px;z-index:2000}#masthead .navbar-brand img{display:inline;width:26px;vertical-align:top} #masthead .navbar-brand a{color:white;text-decoration:none} +#masthead .iconbar{position:absolute;top:2px;right:110px;cursor:pointer;color:#ccc;overflow:hidden}#masthead .iconbar .symbol{float:left;margin:0px 8px} +#masthead .iconbar .symbol .number{font-weight:bold;font-size:12px;font-family:"Lucida Grande",verdana,arial,helvetica,sans-serif;position:relative;left:23px;top:-18px} +#masthead .iconbar .toggle{color:#BCC800} .quota-meter-container{position:absolute;top:0;right:0;height:32px} .quota-meter{position:absolute;top:8px;right:8px;height:16px;width:100px;background-color:#f5f5f5} .quota-meter-bar{position:absolute;top:0;left:0;height:16px;background-color:#00f} diff -r ea0c57f1cdf0c17906bda3455ca0201972eb87c9 -r 8bcdf94c187a717731d714d9e7c64e747966ed36 static/style/blue/galaxy.frame.css --- a/static/style/blue/galaxy.frame.css +++ b/static/style/blue/galaxy.frame.css @@ -2,11 +2,6 @@ galaxy generic styles */ -.bs-tooltip -{ - z-index: 34010; -} - .galaxy-corner { -moz-border-radius: 4px; @@ -92,42 +87,6 @@ } /* - panel active button -*/ -.galaxy-frame-active -{ - z-index : 34010; - position : absolute; - top : 2px; - right : 120px; - cursor : pointer; - color : #D0D0D0; -} - -/* - panel load button -*/ -.galaxy-frame-load -{ - z-index : 34010; - position : absolute; - top : 6px; - right : 170px; - cursor : pointer; - color : #BCC800; -} - -.galaxy-frame-load .number -{ - position : absolute; - font-weight : bold; - font-size : 12px; - font-family : Verdana, Arial; - top : 8px; - left : 26px; -} - -/* frame components */ .galaxy-frame .f-content @@ -175,7 +134,7 @@ .galaxy-frame .f-title { position : absolute; - top : 4px; + top : 2px; left : 16px; right : 16px; font-size : 12px; @@ -202,13 +161,13 @@ .galaxy-frame .f-close { right : 5px; - top : 4px; + top : 1px; } .galaxy-frame .f-pin { left : 6px; - top : 4px; + top : 1px; } .galaxy-frame .f-resize diff -r ea0c57f1cdf0c17906bda3455ca0201972eb87c9 -r 8bcdf94c187a717731d714d9e7c64e747966ed36 static/style/blue/galaxy.master.css --- a/static/style/blue/galaxy.master.css +++ /dev/null @@ -1,30 +0,0 @@ -/* - galaxy master -*/ -.galaxy-master -{ - position : absolute; - top : 0px; - right : 100px; - cursor : pointer; - color : #D0D0D0; - overflow : hidden; - z-index : 34010; - padding : 8px; -} - -.galaxy-icon -{ - float : left; - margin : 0px 10px; -} - -.galaxy-icon .number -{ - font-weight : bold; - font-size : 12px; - font-family : Verdana, Arial; - position : relative; - left : 23px; - top : -9px; -} \ No newline at end of file diff -r ea0c57f1cdf0c17906bda3455ca0201972eb87c9 -r 8bcdf94c187a717731d714d9e7c64e747966ed36 static/style/src/less/base.less --- a/static/style/src/less/base.less +++ b/static/style/src/less/base.less @@ -318,7 +318,7 @@ top:0; left:0; width:100%; - min-width:900px; + min-width:920px; padding: 0; .nav { @@ -368,6 +368,37 @@ text-decoration: none; } } + + .iconbar + { + position : absolute; + top : 2px; + right : 110px; + cursor : pointer; + color : @navbar-default-toggle-icon-bar-bg; + overflow : hidden; + + .symbol + { + float : left; + margin : 0px 8px; + } + + .symbol .number + { + font-weight : bold; + font-size : 12px; + font-family : @font-family-sans-serif; + position : relative; + left : 23px; + top : -18px; + } + + .toggle + { + color : #BCC800;; + } + } } Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.
participants (1)
-
commits-noreply＠bitbucket.org