21 Mar
2012
21 Mar
'12
11:47 a.m.
23 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/d0004f5eea59/ changeset: d0004f5eea59 user: james_taylor date: 2012-02-13 23:40:42 summary: style: allow stylesheets to be written in less instead of our custom approach, convert base and panel_layout, resulting CSS is equivalent affected #: 6 files diff -r 95876f2552d354bf88320521dcf5083f31147bf0 -r d0004f5eea59f83543349b161fdb4559d543b07c static/june_2007_style/Makefile --- a/static/june_2007_style/Makefile +++ b/static/june_2007_style/Makefile @@ -1,26 +1,26 @@ -menu_bg.png : - ./gradient.py 9 1000 DDDDFF 9999FF FFFFFF 0 0 FFFFFF 1 1 > $@ +OUT=blue +INI=$(OUT)_colors.ini -base_bg.png : - ./gradient.py 9 1000 EEEEFF - FFFFFF 0 0 FFFFFF 1 1 > $@ +# The catch-all rule is magic, it reruns make in the OUT directory with a VPATH +all: + @( cd blue; make -f ../Makefile VPATH=.. css ) -masthead_bg.png : - ./gradient.py 9 50 023858 000000 000000 0 0.5 000000 1 1 > $@ +ALL_CSS=base panel_layout masthead library history tool_menu iphone autocomplete_tagging trackster -footer_title_bg.png : - ./gradient.py 9 30 023858 000000 000000 0 0.5 000000 1 1 > $@ +css: $(foreach N,$(ALL_CSS),$N.css) -form_title_bg.png : - ./gradient.py 9 50 ebd9b2 b9a780 FFFFFF 0 0 FFFFFF 0.5 1 > $@ +# Convert variables from ini to less syntax +variables.less : $(INI) + ./variables_to_less.py < $< > $@ -ok_bg.png : - ./gradient.py 9 200 AAFFAA - CCFFCC 0 0.5 CCFFCC 1 1 > $@ +# Convert using less +%.css : %.less + lessc -x --include-path=$(OUT) $< > $@ -error_bg.png : - ./gradient.py 9 200 FFAAAA - FFCCCC 0 0.5 FFCCCC 1 1 > $@ +# Old style using process_css still works so we can move gradually +%.css : %.css.tmpl + ./process_css.py $(INI) shared_images:../images $(OUT) < $< > $@ -warn_bg.png : - ./gradient.py 9 200 FFFFAA - FFFFCC 0 0.5 FFFFCC 1 1 > $@ - -gray_bg.png : - ./gradient.py 9 200 AAAAAA - CCCCCC 0 0.5 CCCCCC 1 1 > $@ +# For building sprite images +%.less : %.less.tmpl + ./process_css.py $(INI) shared_images:../images $(OUT) < $< > $@ diff -r 95876f2552d354bf88320521dcf5083f31147bf0 -r d0004f5eea59f83543349b161fdb4559d543b07c static/june_2007_style/blue/base.css --- a/static/june_2007_style/blue/base.css +++ b/static/june_2007_style/blue/base.css @@ -5,7 +5,7 @@ body{font-size:75%;} .unselectable{user-select:none;-moz-user-select:none;-webkit-user-select:none;} .shadow{-moz-box-shadow:0 3px 30px black;-webkit-box-shadow:0 3px 30px black;} -body{background:#FFFFFF;color:#303030;background-image:url(base_bg.png);background-repeat:repeat-x;background-position:top;margin:10px;} +body{background:#ffffff;color:#303030;background-image:url(base_bg.png);background-repeat:repeat-x;background-position:top;margin:10px;} img{border:0;} a:link,a:visited,a:active{color:#303030;} h1,h2,h3,h4{color:#023858;} @@ -17,10 +17,10 @@ div.toolFormTitle{font-weight:bold;padding:5px;padding-left:10px;padding-right:10px;background:#ebd9b2;background-repeat:repeat-x;background-position:top;border-bottom:solid #d8b365 1px;} div.toolParamHelp{color:#666;} div.toolParamHelp a{color:#666;} -div.toolFormBody{background:#FFFFFF;background-image:url(form_body_bg.png);background-repeat:repeat-x;background-position:top;padding:5px 0;} +div.toolFormBody{background:#ffffff;background-image:url(form_body_bg.png);background-repeat:repeat-x;background-position:top;padding:5px 0;} div.toolFormBody div.toolFormTitle{background:transparent;border:none;font-weight:bold;border-bottom:solid #d8b365 1px;margin-bottom:5px;} -div.toolFormDisabled div.toolFormTitle{background:#eee;border-color:#999;} -div.toolFormDisabled{border-color:#999;} +div.toolFormDisabled div.toolFormTitle{background:#eeeeee;border-color:#999999;} +div.toolFormDisabled{border-color:#999999;} div.toolHelp{margin-top:10px;} div.toolHelpBody{width:100%;} div.metadataForm{border:solid #aaaaaa 1px;} @@ -37,7 +37,7 @@ div.form-row{padding:5px 10px;} div.form-title-row{padding:5px 10px;} div.repeat-group-item{border-left:solid #d8b365 5px;margin-left:10px;margin-bottom:10px;} -div.form-row-error{background:#FFCCCC;} +div.form-row-error{background:#ffcccc;} div.form-row label{font-weight:bold;display:block;margin-bottom:.2em;} div.form-row label.inline{display:inline;} div.form-row-input{float:left;} @@ -46,15 +46,15 @@ .form-row .help{color:#666;} select,input,textarea{font:inherit;} select,textarea,input[type="text"],input[type="file"],input[type="password"]{-webkit-box-sizing:border-box;max-width:300px;} -.errormessagelarge,.warningmessagelarge,.donemessagelarge,.infomessagelarge{padding:10px;padding-left:52px;min-height:32px;border:1px solid #AA6666;background-color:#FFCCCC;background-image:url(error_message_icon.png);background-repeat:no-repeat;background-position:10px 10px;} -.warningmessagelarge{background-image:url(warn_message_icon.png);border-color:#AAAA66;background-color:#FFFFCC;} -.donemessagelarge{background-image:url(done_message_icon.png);border-color:#66AA66;background-color:#CCFFCC;} -.infomessagelarge{background-image:url(info_message_icon.png);border-color:#6666AA;background-color:#CCCCFF;} +.errormessagelarge,.warningmessagelarge,.donemessagelarge,.infomessagelarge{padding:10px;padding-left:52px;min-height:32px;border:1px solid #aa6666;background-color:#ffcccc;background-image:url(error_message_icon.png);background-repeat:no-repeat;background-position:10px 10px;} +.warningmessagelarge{background-image:url(warn_message_icon.png);border-color:#aaaa66;background-color:#ffffcc;} +.donemessagelarge{background-image:url(done_message_icon.png);border-color:#66aa66;background-color:#ccffcc;} +.infomessagelarge{background-image:url(info_message_icon.png);border-color:#6666aa;background-color:#ccccff;} .screencastBox{padding-left:10px;border-color:#AAAA66;background-color:#FFFFCC;background-image:none;} -.errormessage,.warningmessage,.donemessage,.infomessage,.errormessagesmall,.warningmessagesmall,.donemessagesmall,.infomessagesmall{padding:5px;padding-left:25px;min-height:15px;border:1px solid #AA6666;background-color:#FFCCCC;background-image:url(error_small.png);background-repeat:no-repeat;background-position:5px 5px;} -.warningmessage,.warningmessagesmall{background-image:url(warn_small.png);border-color:#AAAA66;background-color:#FFFFCC;} -.donemessage,.donemessagesmall{background-image:url(ok_small.png);border-color:#66AA66;background-color:#CCFFCC;} -.infomessage,.infomessagesmall{background-image:url(info_small.png);border-color:#6666AA;background-color:#CCCCFF;} +.errormessage,.warningmessage,.donemessage,.infomessage,.errormessagesmall,.warningmessagesmall,.donemessagesmall,.infomessagesmall{padding:5px;padding-left:25px;min-height:15px;border:1px solid #aa6666;background-color:#ffcccc;background-image:url(error_small.png);background-repeat:no-repeat;background-position:5px 5px;} +.warningmessage,.warningmessagesmall{background-image:url(warn_small.png);border-color:#aaaa66;background-color:#ffffcc;} +.donemessage,.donemessagesmall{background-image:url(ok_small.png);border-color:#66aa66;background-color:#ccffcc;} +.infomessage,.infomessagesmall{background-image:url(info_small.png);border-color:#6666aa;background-color:#ccccff;} .errormark,.warningmark,.donemark,.infomark,.ok_bgr,.err_bgr{padding-left:20px;min-height:15px;background:url(error_small.png) no-repeat;} .warningmark{background-image:url(warn_small.png);} .donemark{background-image:url(ok_small.png);} @@ -70,12 +70,12 @@ table.colored{border-top:solid #d8b365 1px;border-bottom:solid #d8b365 1px;} table.colored td,table.colored th{text-align:left;padding:5px;} table.colored tr.header{background:#ebd9b2;background-image:url(form_title_bg.png);background-repeat:repeat-x;background-position:top;border-bottom:solid #d8b365 1px;font-weight:bold;} -table.colored tr{background:white;} -table.colored tr.odd_row{background:#DADFEF;} +table.colored tr{background:#ffffff;} +table.colored tr.odd_row{background:#dadfef;} div.debug{margin:10px;padding:5px;background:#FFFF99;border:solid #FFFF33 1px;color:black;} -div.odd_row{background:#DADFEF;} +div.odd_row{background:#dadfef;} #footer{display:none;} -td.panel-body{background:white;color:#303030;background:#C1C9E5 url(menu_bg.png) top repeat-x;} +td.panel-body{background:white;color:#303030;background:#c1c9e5 url(menu_bg.png) top repeat-x;} div.toolSectionPad{margin:0;padding:0;height:5px;font-size:0px;} div.toolSectionDetailsInner{margin-left:5px;margin-right:5px;} div.toolSectionTitle{padding-bottom:0px;font-weight:bold;} @@ -84,14 +84,14 @@ ul.toolParameterExpandableCollapsable{list-style:none;} ul.manage-table-actions{float:right;margin-top:-2.5em;} ul.manage-table-actions li{display:block;float:left;margin-left:0.5em;} -.state-color-new{border-color:#A86030;background:#FFB030;} -.state-color-upload{border-color:#6666AA;background:#CCCCFF;} -.state-color-waiting{border-color:#A86030;background:#E8C060;} -.state-color-queued{border-color:#888888;background:#EEEEEE;} -.state-color-running{border-color:#AAAA66;background:#FFFFCC;} -.state-color-ok{border-color:#66AA66;background:#CCFFCC;} -.state-color-error{border-color:#AA6666;background:#FFCCCC;} -.state-color-deleted{border-color:#330066;background:#3399FF;} +.state-color-new{border-color:#a86030;background:#ffb030;} +.state-color-upload{border-color:#6666aa;background:#ccccff;} +.state-color-waiting{border-color:#a86030;background:#e8c060;} +.state-color-queued{border-color:#888888;background:#eeeeee;} +.state-color-running{border-color:#aaaa66;background:#ffffcc;} +.state-color-ok{border-color:#66aa66;background:#ccffcc;} +.state-color-error{border-color:#aa6666;background:#ffcccc;} +.state-color-deleted{border-color:#330066;background:#3399ff;} .state-fg-new{color:#FFB030;} .state-fg-upload{color:#D090D0;} .state-fg-waiting{color:#E8C060;} @@ -101,20 +101,17 @@ .state-fg-error{color:#AA6666;} .state-fg-deleted{color:#3399FF;} .action-button{background:transparent;line-height:16px;color:#333;text-decoration:none;font-size:100%;font-weight:bold;display:inline-block;cursor:pointer;padding:2px;border:solid #aaaaaa 1px;padding-right:0.5em;padding-left:0.5em;-moz-border-radius:0.5em;-webkit-border-radius:0.5em;border-radius:0.5em;user-select:none;-moz-user-select:none;-webkit-user-select:none;} -.action-button > *{vertical-align:middle;} +.action-button>*{vertical-align:middle;} .action-button:hover{color:black;background:#dddddd;} .action-button:active{color:white;background:#aaaaaa;} -.menubutton{display:inline-block;cursor:pointer;position:relative;user-select:none;-moz-user-select:none;-webkit-user-select:none;border:solid transparent 1px;-moz-border-radius:0.25em;-webkit-border-radius:0.25em;border-radius:0.25em;padding:1px 0.25em;margin:-1px -0.25em;} -.menubutton .label{position:relative;display:block;border-right:none;} +.menubutton{display:inline-block;cursor:pointer;position:relative;user-select:none;-moz-user-select:none;-webkit-user-select:none;border:solid transparent 1px;-moz-border-radius:0.25em;-webkit-border-radius:0.25em;border-radius:0.25em;padding:1px 0.25em;margin:-1px -0.25em;}.menubutton .label{position:relative;display:block;border-right:none;} .menubutton.action-button{border-color:#aaaaaa;} .menubutton.popup,.action-button.popup{padding-right:20px;background-image:url(../images/dropdownarrow.png);background-repeat:no-repeat;background-position:right 7px;} .menubutton:hover{border-color:#aaaaaa;} .menubutton.popup.split{padding-right:2em;} .menubutton.popup.split:hover{background:url(../images/ddarrowsplit.png) no-repeat right -39px;} -.overlay-border{position:absolute;top:0;left:0;height:100%;width:100%;padding:1em;margin:-1em;background-color:rgba(0,0,0,0.5);-moz-border-radius:1em;-webkit-border-radius:1em;z-index:-1;} -div.popmenu-wrapper{position:absolute;top:100%;z-index:20000;} -div.popmenu-wrapper ul{display:block;margin:0;padding:0;background:white;color:#333;font-weight:bold;font-style:normal;white-space:nowrap;border:solid #aaaaaa 1px;padding:3px 0;-moz-border-radius:0.5em;-webkit-border-radius:0.5em;border-radius:0.5em;user-select:none;-moz-user-select:none;-webkit-user-select:none;} -div.popmenu-wrapper ul li{display:block;padding:3px 1em;cursor:pointer;border-top:solid transparent 1px;border-bottom:solid transparent 1px;} +.overlay-border{position:absolute;top:0;left:0;height:100%;width:100%;padding:1em;margin:-1em;background-color:rgba(0, 0, 0, 0.5);-moz-border-radius:1em;-webkit-border-radius:1em;z-index:-1;} +div.popmenu-wrapper{position:absolute;top:100%;z-index:20000;}div.popmenu-wrapper ul{display:block;margin:0;padding:0;background:white;color:#333;font-weight:bold;font-style:normal;white-space:nowrap;border:solid #aaaaaa 1px;padding:3px 0;-moz-border-radius:0.5em;-webkit-border-radius:0.5em;border-radius:0.5em;user-select:none;-moz-user-select:none;-webkit-user-select:none;}div.popmenu-wrapper ul li{display:block;padding:3px 1em;cursor:pointer;border-top:solid transparent 1px;border-bottom:solid transparent 1px;} div.popmenu-wrapper ul li.head{color:#999;font-style:italic;} div.popmenu-wrapper ul li:hover{background:#EEEEFF;border-color:#aaa;} div.popmenu-wrapper ul li.head:hover{background:inherit;border-color:transparent;} @@ -131,7 +128,6 @@ .grid thead th{background:#ebd9b2;background-repeat:repeat-x;background-position:top;border-top:solid #d8b365 1px;border-bottom:solid #d8b365 1px;padding:0.3em 0.5em;text-align:left;white-space:nowrap;} .grid tfoot td{background-color:#F8F8F8;border-top:solid #DDDDDD 1px;border-bottom:solid #DDDDDD 1px;padding:0.3em 0.5em;} .grid .current{background-color:#EEEEFF;} -.text-content{} .text-content hr{display:block;background:black;color:black;width:100%;height:1px;border:none;background:#aaa;color:#aaa;} .text-content table{border-collapse:collapse;border-top:1px solid #ccc;border-left:1px solid #ccc;} .text-content blockquote{color:#666;} @@ -139,7 +135,7 @@ .text-content th,.text-content td{border-bottom:1px solid #ddd;border-right:1px solid #ccc;} .text-content th,.text-content td{padding:.8em;} .icon-button{width:16px;height:16px;display:block;float:left;margin-left:2px;text-indent:20px;background-repeat:no-repeat;background-position:0px 0px;padding:0;} -.icon-button.display{background:url(history-buttons.png) no-repeat 0px -0px;} +.icon-button.display{background:url(history-buttons.png) no-repeat 0px 0px;} .icon-button.display:hover{background:url(history-buttons.png) no-repeat 0px -26px;} .icon-button.display_disabled{background:url(history-buttons.png) no-repeat 0px -52px;} .icon-button.delete{background:url(history-buttons.png) no-repeat 0px -78px;} @@ -148,24 +144,22 @@ .icon-button.edit{background:url(history-buttons.png) no-repeat 0px -156px;} .icon-button.edit:hover{background:url(history-buttons.png) no-repeat 0px -182px;} .icon-button.edit_disabled{background:url(history-buttons.png) no-repeat 0px -208px;} -.icon-button.tag{background:url(fugue.png) no-repeat 0px -0px;} +.icon-button.tag{background:url(fugue.png) no-repeat 0px 0px;} .icon-button.tags{background:url(fugue.png) no-repeat 0px -26px;} .icon-button.tag--plus{background:url(fugue.png) no-repeat 0px -52px;} -.icon-button.toggle-expand{background:transparent url(../images/fugue/toggle-expand-bw.png) no-repeat;} -.icon-button.toggle-expand:hover{background:url(fugue.png) no-repeat 0px -78px;} -.icon-button.toggle{background:transparent url(../images/fugue/toggle-bw.png) no-repeat;} -.icon-button.toggle:hover{background:url(fugue.png) no-repeat 0px -104px;} +.icon-button.toggle-expand{background:url(fugue.png) no-repeat 0px -78px;} +.icon-button.toggle{background:url(fugue.png) no-repeat 0px -104px;} .icon-button.arrow-circle{background:url(fugue.png) no-repeat 0px -130px;} .icon-button.chevron{background:url(fugue.png) no-repeat 0px -156px;} .icon-button.bug{background:url(fugue.png) no-repeat 0px -182px;} .icon-button.disk{background:url(fugue.png) no-repeat 0px -208px;} .icon-button.information{background:url(fugue.png) no-repeat 0px -234px;} .icon-button.annotate{background:url(fugue.png) no-repeat 0px -260px;} -.icon-button.chart_curve{background:url(../images/silk/chart_curve.png) no-repeat;} -.icon-button.go-to-full-screen{background:url(fugue.png) no-repeat 0px -312px;} -.icon-button.import{background:url(fugue.png) no-repeat 0px -338px;} -.icon-button.plus-button{background:url(fugue.png) no-repeat 0px -364px;} -.icon-button.gear{background:url(fugue.png) no-repeat 0px -390px;} +.icon-button.go-to-full-screen{background:url(fugue.png) no-repeat 0px -286px;} +.icon-button.import{background:url(fugue.png) no-repeat 0px -312px;} +.icon-button.plus-button{background:url(fugue.png) no-repeat 0px -338px;} +.icon-button.gear{background:url(fugue.png) no-repeat 0px -364px;} +.text-and-autocomplete-select{background:url(fugue.png) no-repeat right -390px;} .tipsy{padding:5px;font-size:10px;filter:alpha(opacity=80);background-repeat:no-repeat;background-image:url(../images/tipsy.gif);} .tipsy-inner{padding:5px 8px 4px 8px;background-color:black;color:white;max-width:200px;text-align:center;} .tipsy-north{background-position:top center;} @@ -174,7 +168,6 @@ .tipsy-west{background-position:left center;} .editable-text{cursor:pointer;} .editable-text:hover{cursor:text;border:dotted #999999 1px;} -.text-and-autocomplete-select{background:url(fugue.png) no-repeat right -416px;} .icon-button.multiinput{background:url(../images/documents-stack.png) no-repeat;cursor:pointer;float:none;display:inline-block;margin-left:10px;} .icon-button.multiinput.disabled{background:url(../images/documents-stack-faded.png) no-repeat;cursor:auto;} .workflow-invocation-complete{border:solid 1px #6A6;border-left-width:5px;margin:10px 0;padding-left:5px;} diff -r 95876f2552d354bf88320521dcf5083f31147bf0 -r d0004f5eea59f83543349b161fdb4559d543b07c static/june_2007_style/blue/fugue.png Binary file static/june_2007_style/blue/fugue.png has changed diff -r 95876f2552d354bf88320521dcf5083f31147bf0 -r d0004f5eea59f83543349b161fdb4559d543b07c static/june_2007_style/blue/panel_layout.css --- a/static/june_2007_style/blue/panel_layout.css +++ b/static/june_2007_style/blue/panel_layout.css @@ -1,53 +1,340 @@ -body{font:75% "Lucida Grande",verdana,arial,helvetica,sans-serif;background:#eee;} -.unselectable{user-select:none;-moz-user-select:none;-webkit-user-select:none;} -#background{position:absolute;background:#eee;z-index:-1;top:0;left:0;margin:0;padding:0;width:100%;height:100%;} -#messagebox{position:absolute;top:33px;left:0;width:100%;height:24px !important;overflow:hidden;border-bottom:solid #999 1px;font-size:90%;} -#left,#left-border,#center,#right-border,#right{position:absolute;top:39px;bottom:0px;overflow:hidden;background:#fff;} -#left,#center,#right{border-top:solid #999 1px;} -#left-border,#right-border{background:#eeeeee;border-left:solid #999 1px;border-right:solid #999 1px;padding-right:1px;padding-left:1px;width:5px;z-index:10000;} -#left-border div,#right-border div{width:100%;height:100%;background-repeat:no-repeat;background-position:center center;position:absolute;width:5px;height:100%;} -#left-border div,#right-border.hidden div{background-image:url(tiny_arrow_left.png);cursor:w-resize;} -#left-border.hidden div,#right-border div{background-image:url(tiny_arrow_right.png);cursor:e-resize;} -#left-border.hover div,#right-border.hover div{background-color:#AAAAEE;} -#left{left:0px;width:250px;z-index:200;} -#left-border{left:250px;} -#center{left:259px;right:259px;overflow:hidden;z-index:1;} -#right-border{right:250px;} -#right{width:250px;right:0px;z-index:200;} -.unified-panel-header{height:2em;z-index:1000;background:#cccccc;background-image:url(panel_header_bg.png);background-position:top center;background-repeat:repeat-x;border-bottom:solid #999 1px;margin:0;padding:0;padding-right:10px;padding-left:10px;color:#333;font-weight:bold;} -.unified-panel-header-inner{padding-top:0.45em;} -.menu-bg{background:#C1C9E5 url(menu_bg.png) top repeat-x;} -div.unified-panel-body{position:absolute;top:2em;bottom:0;width:100%;margin-top:1px;} -.panel-header-button{color:#333;text-decoration:none;display:inline-block;cursor:pointer;margin:-1px;padding:1px;margin-top:-0.2em;border:solid #999 1px;padding-right:0.5em;padding-left:0.5em;-moz-border-radius:0.5em;-webkit-border-radius:0.5em;border-radius:0.5em;} -.panel-header-button.popup{padding-right:1.75em;background:url(../images/dropdownarrow.png) no-repeat right 7px;} -.panel-header-button:hover{color:black;background-color:#ccc;} -.panel-header-button:active{color:white;background-color:#aaaaaa;} -#overlay{position:fixed;top:0;left:0;width:100%;height:100%;z-index:20000;} -#overlay.modal #overlay-background{background:rgba(0,0,0,0.5);} -.dialog-box-container{position:relative;margin-top:80px;margin-right:auto;margin-left:auto;} -.dialog-box-wrapper{position:relative;padding:1em;background-color:rgba(0,0,0,0.5);-moz-border-radius:1em;-webkit-border-radius:1em;} -.dialog-box{border:solid #999 1px;background:white;z-index:80000;} -#overlay.modal .dialog-box .body{min-width:600px;} -.dialog-box .body{padding:5px;overflow:auto;max-height:500px;min-width:300px;} -.dialog-box .buttons{padding:5px;} -.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;} -.panel-done-message{background-image:url(done_small.png);background-color:#CCFFCC;} -.panel-info-message{background-image:url(info_small.png);background-color:#CCCCFF;} -#masthead{position:absolute;top:0;left:0;width:100%;min-width:900px;height:32px;background:#2C3143;color:#fff;border-bottom:solid #444 1px;z-index:15000;padding:0;} -#masthead a{color:#eeeeee;text-decoration:none;} -#masthead .title{font-family:verdana;padding:3px 10px;font-size:175%;font-weight:bold;z-index:-1;} -#masthead a:hover{text-decoration:underline;} -.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:#C1C9E5;;} -.quota-meter-bar{position:absolute;top:0;left:0;height:16px;background-color:#969DB3;;} -.quota-meter-bar-warn{background-color:#FFB400;;} -.quota-meter-bar-error{background-color:#FF4343;;} -.quota-meter-text{position:absolute;top:50%;left:0;width:100px;height:16px;margin-top:-6px;text-align:center;z-index:9001;color:#000;;} -.tab-group{margin:0;padding:0 10px;height:100%;white-space:nowrap;cursor:default;background:transparent;} -.tab-group .tab{background:#2C3143;position:relative;float:left;margin:0;padding:0 1em;height:32px;line-height:32px;text-align:left;} -.tab-group .tab .submenu{display:none;position:absolute;z-index:16000;left:0;top:32px;padding:1em;margin:-1em;padding-top:0;margin-top:0;background-color:rgba(0,0,0,0.5);-moz-border-radius:0 0 1em 1em;-webkit-border-bottom-right-radius:1em;-webkit-border-bottom-left-radius:1em;} -.tab-group .tab .submenu ul{display:block;margin:0;padding:0;list-style-type:none;background:#2C3143;} -.tab-group .tab .submenu ul li{display:block;padding:0 1em;white-space:nowrap;} -.tab-group .tab:hover > a{color:gold !important;} -.tab-group .active{background:rgb(1,1,1);} +body { + font: 75% "Lucida Grande", verdana, arial, helvetica, sans-serif; + background: #eeeeee; +} +.unselectable { + user-select: none; + -moz-user-select: none; + -webkit-user-select: none; +} +#background { + position: absolute; + background: #eeeeee; + z-index: -1; + top: 0; + left: 0; + margin: 0; + padding: 0; + width: 100%; + height: 100%; +} +#messagebox { + position: absolute; + top: 33px; + left: 0; + width: 100%; + height: 24px !important; + overflow: hidden; + border-bottom: solid #999 1px; + font-size: 90%; +} +#left, +#left-border, +#center, +#right-border, +#right { + position: absolute; + top: 39px; + bottom: 0px; + overflow: hidden; + background: #fff; +} +#left, +#center, +#right { + border-top: solid #999999 1px; +} +#left-border, +#right-border { + background: #eeeeee; + border-left: solid #999999 1px; + border-right: solid #999999 1px; + padding-right: 1px; + padding-left: 1px; + width: 5px; + z-index: 10000; +} +#left-border div, +#right-border div { + width: 100%; + height: 100%; + background-repeat: no-repeat; + background-position: center center; + position: absolute; + width: 5px; + height: 100%; +} +#left-border div, +#right-border.hidden div { + background-image: url(tiny_arrow_left.png); + cursor: w-resize; +} +#left-border.hidden div, +#right-border div { + background-image: url(tiny_arrow_right.png); + cursor: e-resize; +} +#left-border.hover div, +#right-border.hover div { + background-color: #aaaaee; +} +#left { + left: 0px; + width: 250px; + z-index: 200; +} +#left-border { + left: 250px; +} +#center { + left: 259px; + right: 259px; + overflow: hidden; + z-index: 1; +} +#right-border { + right: 250px; +} +#right { + width: 250px; + right: 0px; + z-index: 200; +} +.unified-panel-header { + height: 2em; + z-index: 1000; + background: #cccccc; + background-image: url(panel_header_bg.png); + background-position: top center; + background-repeat: repeat-x; + border-bottom: solid #999999 1px; + margin: 0; + padding: 0; + padding-right: 10px; + padding-left: 10px; + color: #333; + font-weight: bold; +} +.unified-panel-header-inner { + padding-top: 0.45em; +} +.menu-bg { + background: #c1c9e5 url(menu_bg.png) top repeat-x; +} +div.unified-panel-body { + position: absolute; + top: 2em; + bottom: 0; + width: 100%; + margin-top: 1px; +} +.panel-header-button { + color: #333; + text-decoration: none; + display: inline-block; + cursor: pointer; + margin: -1px; + padding: 1px; + margin-top: -0.2em; + border: solid #999 1px; + padding-right: 0.5em; + padding-left: 0.5em; + -moz-border-radius: 0.5em; + -webkit-border-radius: 0.5em; + border-radius: 0.5em; +} +.panel-header-button.popup { + padding-right: 1.75em; + background: url(../images/dropdownarrow.png) no-repeat right 7px; +} +.panel-header-button:hover { + color: black; + background-color: #ccc; +} +.panel-header-button:active { + color: white; + background-color: #aaaaaa; +} +#overlay { + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 100%; + z-index: 20000; +} +#overlay.modal #overlay-background { + background: rgba(0, 0, 0, 0.5); +} +.dialog-box-container { + position: relative; + margin-top: 80px; + margin-right: auto; + margin-left: auto; +} +.dialog-box-wrapper { + position: relative; + padding: 1em; + background-color: rgba(0, 0, 0, 0.5); + -moz-border-radius: 1em; + -webkit-border-radius: 1em; +} +.dialog-box { + border: solid #999 1px; + background: white; + z-index: 80000; +} +#overlay.modal .dialog-box .body { + min-width: 600px; +} +.dialog-box .body { + padding: 5px; + overflow: auto; + max-height: 500px; + min-width: 300px; +} +.dialog-box .buttons { + padding: 5px; +} +.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; +} +.panel-done-message { + background-image: url(done_small.png); + background-color: #ccffcc; +} +.panel-info-message { + background-image: url(info_small.png); + background-color: #ccccff; +} +#masthead { + position: absolute; + top: 0; + left: 0; + width: 100%; + min-width: 900px; + height: 32px; + background: #2c3143; + color: #fff; + border-bottom: solid #444444 1px; + z-index: 15000; + padding: 0; +} +#masthead a { + color: #eeeeee; + text-decoration: none; +} +#masthead .title { + font-family: verdana; + padding: 3px 10px; + font-size: 175%; + font-weight: bold; + z-index: -1; +} +#masthead a:hover { + text-decoration: underline; +} +.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: #c1c9e5; +} +.quota-meter-bar { + position: absolute; + top: 0; + left: 0; + height: 16px; + background-color: #969db3; +} +.quota-meter-bar-warn { + background-color: #ffb400; +} +.quota-meter-bar-error { + background-color: #ff4343; +} +.quota-meter-text { + position: absolute; + top: 50%; + left: 0; + width: 100px; + height: 16px; + margin-top: -6px; + text-align: center; + z-index: 9001; + color: #000000; +} +.tab-group { + margin: 0; + padding: 0 10px; + height: 100%; + white-space: nowrap; + cursor: default; + background: transparent; +} +.tab-group .tab { + background: #2c3143; + position: relative; + float: left; + margin: 0; + padding: 0 1em; + height: 32px; + line-height: 32px; + text-align: left; +} +.tab-group .tab .submenu { + display: none; + position: absolute; + z-index: 16000; + left: 0; + top: 32px; + padding: 1em; + margin: -1em; + padding-top: 0; + margin-top: 0; + background-color: rgba(0, 0, 0, 0.5); + -moz-border-radius: 0 0 1em 1em; + -webkit-border-bottom-right-radius: 1em; + -webkit-border-bottom-left-radius: 1em; +} +.tab-group .tab .submenu ul { + display: block; + margin: 0; + padding: 0; + list-style-type: none; + background: #2c3143; +} +.tab-group .tab .submenu ul li { + display: block; + padding: 0 1em; + white-space: nowrap; +} +.tab-group .tab:hover > a { + color: gold !important; +} +.tab-group .active { + background: #010101; +} diff -r 95876f2552d354bf88320521dcf5083f31147bf0 -r d0004f5eea59f83543349b161fdb4559d543b07c static/june_2007_style/blue_colors.ini --- a/static/june_2007_style/blue_colors.ini +++ b/static/june_2007_style/blue_colors.ini @@ -60,11 +60,11 @@ masthead_link=#eeeeee masthead_active_tab_bg=#222532 # Quota meter -quota_meter_bg=#C1C9E5; -quota_meter_bar=#969DB3; -quota_meter_warn_bar=#FFB400; -quota_meter_error_bar=#FF4343; -quota_meter_text=#000; +quota_meter_bg=#C1C9E5 +quota_meter_bar=#969DB3 +quota_meter_warn_bar=#FFB400 +quota_meter_error_bar=#FF4343 +quota_meter_text=#000 # ---- Layout ----------------------------------------------------------------- # Overall background color (including space between panels) layout_bg=#eee diff -r 95876f2552d354bf88320521dcf5083f31147bf0 -r d0004f5eea59f83543349b161fdb4559d543b07c static/june_2007_style/process_css.py --- a/static/june_2007_style/process_css.py +++ b/static/june_2007_style/process_css.py @@ -108,6 +108,9 @@ stylesheet_parser = build_stylesheet_parser() +class LessTemplate( string.Template ): + delimeter = "@" + class CSSProcessor( object ): def process( self, file, out, variables, image_dir, out_dir ): @@ -161,6 +164,8 @@ for selectors, properties in rules: for p in properties: p[1] = string.Template( p[1] ).substitute( context ).strip() + # Less style uses @ to prefix variables + p[1] = LessTemplate( p[1] ).substitute( context ).strip() def make_sprites( self, rules, image_dir, out_dir ): https://bitbucket.org/galaxy/galaxy-central/changeset/b1dac5a9b1d7/ changeset: b1dac5a9b1d7 user: james_taylor date: 2012-02-14 17:42:20 summary: style: adding (clean) bootstrap version 2 affected #: 35 files diff -r d0004f5eea59f83543349b161fdb4559d543b07c -r b1dac5a9b1d7d01a9e55940a4546fc5ed6f79bd0 static/june_2007_style/bootstrap/accordion.less --- /dev/null +++ b/static/june_2007_style/bootstrap/accordion.less @@ -0,0 +1,28 @@ +// ACCORDION +// --------- + + +// Parent container +.accordion { + margin-bottom: @baseLineHeight; +} + +// Group == heading + body +.accordion-group { + margin-bottom: 2px; + border: 1px solid #e5e5e5; + .border-radius(4px); +} +.accordion-heading { + border-bottom: 0; +} +.accordion-heading .accordion-toggle { + display: block; + padding: 8px 15px; +} + +// Inner needs the styles because you can't animate properly with any styles on the element +.accordion-inner { + padding: 9px 15px; + border-top: 1px solid #e5e5e5; +} diff -r d0004f5eea59f83543349b161fdb4559d543b07c -r b1dac5a9b1d7d01a9e55940a4546fc5ed6f79bd0 static/june_2007_style/bootstrap/alerts.less --- /dev/null +++ b/static/june_2007_style/bootstrap/alerts.less @@ -0,0 +1,70 @@ +// ALERT STYLES +// ------------ + +// Base alert styles +.alert { + padding: 8px 35px 8px 14px; + margin-bottom: @baseLineHeight; + text-shadow: 0 1px 0 rgba(255,255,255,.5); + background-color: @warningBackground; + border: 1px solid @warningBorder; + .border-radius(4px); +} +.alert, +.alert-heading { + color: @warningText; +} + +// Adjust close link position +.alert .close { + position: relative; + top: -2px; + right: -21px; + line-height: 18px; +} + +// Alternate styles +// ---------------- + +.alert-success { + background-color: @successBackground; + border-color: @successBorder; +} +.alert-success, +.alert-success .alert-heading { + color: @successText; +} +.alert-danger, +.alert-error { + background-color: @errorBackground; + border-color: @errorBorder; +} +.alert-danger, +.alert-error, +.alert-danger .alert-heading, +.alert-error .alert-heading { + color: @errorText; +} +.alert-info { + background-color: @infoBackground; + border-color: @infoBorder; +} +.alert-info, +.alert-info .alert-heading { + color: @infoText; +} + + +// Block alerts +// ------------------------ +.alert-block { + padding-top: 14px; + padding-bottom: 14px; +} +.alert-block > p, +.alert-block > ul { + margin-bottom: 0; +} +.alert-block p + p { + margin-top: 5px; +} diff -r d0004f5eea59f83543349b161fdb4559d543b07c -r b1dac5a9b1d7d01a9e55940a4546fc5ed6f79bd0 static/june_2007_style/bootstrap/bootstrap.less --- /dev/null +++ b/static/june_2007_style/bootstrap/bootstrap.less @@ -0,0 +1,62 @@ +/*! + * Bootstrap v2.0.0 + * + * Copyright 2012 Twitter, Inc + * Licensed under the Apache License v2.0 + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Designed and built with all the love in the world @twitter by @mdo and @fat. + */ + +// CSS Reset +@import "reset.less"; + +// Core variables and mixins +@import "variables.less"; // Modify this for custom colors, font-sizes, etc +@import "mixins.less"; + +// Grid system and page structure +@import "scaffolding.less"; +@import "grid.less"; +@import "layouts.less"; + +// Base CSS +@import "type.less"; +@import "code.less"; +@import "forms.less"; +@import "tables.less"; + +// Components: common +@import "sprites.less"; +@import "dropdowns.less"; +@import "wells.less"; +@import "component-animations.less"; +@import "close.less"; + +// Components: Buttons & Alerts +@import "buttons.less"; +@import "button-groups.less"; +@import "alerts.less"; // Note: alerts share common CSS with buttons and thus have styles in buttons.less + +// Components: Nav +@import "navs.less"; +@import "navbar.less"; +@import "breadcrumbs.less"; +@import "pagination.less"; +@import "pager.less"; + +// Components: Popovers +@import "modals.less"; +@import "tooltip.less"; +@import "popovers.less"; + +// Components: Misc +@import "thumbnails.less"; +@import "labels.less"; +@import "progress-bars.less"; +@import "accordion.less"; +@import "carousel.less"; +@import "hero-unit.less"; + +// Utility classes +@import "utilities.less"; // Has to be last to override when necessary diff -r d0004f5eea59f83543349b161fdb4559d543b07c -r b1dac5a9b1d7d01a9e55940a4546fc5ed6f79bd0 static/june_2007_style/bootstrap/breadcrumbs.less --- /dev/null +++ b/static/june_2007_style/bootstrap/breadcrumbs.less @@ -0,0 +1,22 @@ +// BREADCRUMBS +// ----------- + +.breadcrumb { + padding: 7px 14px; + margin: 0 0 @baseLineHeight; + #gradient > .vertical(@white, #f5f5f5); + border: 1px solid #ddd; + .border-radius(3px); + .box-shadow(inset 0 1px 0 @white); + li { + display: inline; + text-shadow: 0 1px 0 @white; + } + .divider { + padding: 0 5px; + color: @grayLight; + } + .active a { + color: @grayDark; + } +} diff -r d0004f5eea59f83543349b161fdb4559d543b07c -r b1dac5a9b1d7d01a9e55940a4546fc5ed6f79bd0 static/june_2007_style/bootstrap/button-groups.less --- /dev/null +++ b/static/june_2007_style/bootstrap/button-groups.less @@ -0,0 +1,147 @@ +// BUTTON GROUPS +// ------------- + + +// Make the div behave like a button +.btn-group { + position: relative; + .clearfix(); // clears the floated buttons + .ie7-restore-left-whitespace(); +} + +// Space out series of button groups +.btn-group + .btn-group { + margin-left: 5px; +} + +// Optional: Group multiple button groups together for a toolbar +.btn-toolbar { + margin-top: @baseLineHeight / 2; + margin-bottom: @baseLineHeight / 2; + .btn-group { + display: inline-block; + .ie7-inline-block(); + } +} + +// Float them, remove border radius, then re-add to first and last elements +.btn-group .btn { + position: relative; + float: left; + margin-left: -1px; + .border-radius(0); +} +// Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match +.btn-group .btn:first-child { + margin-left: 0; + -webkit-border-top-left-radius: 4px; + -moz-border-radius-topleft: 4px; + border-top-left-radius: 4px; + -webkit-border-bottom-left-radius: 4px; + -moz-border-radius-bottomleft: 4px; + border-bottom-left-radius: 4px; +} +.btn-group .btn:last-child, +.btn-group .dropdown-toggle { + -webkit-border-top-right-radius: 4px; + -moz-border-radius-topright: 4px; + border-top-right-radius: 4px; + -webkit-border-bottom-right-radius: 4px; + -moz-border-radius-bottomright: 4px; + border-bottom-right-radius: 4px; +} +// Reset corners for large buttons +.btn-group .btn.large:first-child { + margin-left: 0; + -webkit-border-top-left-radius: 6px; + -moz-border-radius-topleft: 6px; + border-top-left-radius: 6px; + -webkit-border-bottom-left-radius: 6px; + -moz-border-radius-bottomleft: 6px; + border-bottom-left-radius: 6px; +} +.btn-group .btn.large:last-child, +.btn-group .large.dropdown-toggle { + -webkit-border-top-right-radius: 6px; + -moz-border-radius-topright: 6px; + border-top-right-radius: 6px; + -webkit-border-bottom-right-radius: 6px; + -moz-border-radius-bottomright: 6px; + border-bottom-right-radius: 6px; +} + +// On hover/focus/active, bring the proper btn to front +.btn-group .btn:hover, +.btn-group .btn:focus, +.btn-group .btn:active, +.btn-group .btn.active { + z-index: 2; +} + +// On active and open, don't show outline +.btn-group .dropdown-toggle:active, +.btn-group.open .dropdown-toggle { + outline: 0; +} + + + +// Split button dropdowns +// ---------------------- + +// Give the line between buttons some depth +.btn-group .dropdown-toggle { + padding-left: 8px; + padding-right: 8px; + @shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); + .box-shadow(@shadow); + *padding-top: 5px; + *padding-bottom: 5px; +} + +.btn-group.open { + // IE7's z-index only goes to the nearest positioned ancestor, which would + // make the menu appear below buttons that appeared later on the page + *z-index: @zindexDropdown; + + // Reposition menu on open and round all corners + .dropdown-menu { + display: block; + margin-top: 1px; + .border-radius(5px); + } + + .dropdown-toggle { + background-image: none; + @shadow: inset 0 1px 6px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05); + .box-shadow(@shadow); + } +} + +// Reposition the caret +.btn .caret { + margin-top: 7px; + margin-left: 0; +} +.btn:hover .caret, +.open.btn-group .caret { + .opacity(100); +} + + +// Account for other colors +.btn-primary, +.btn-danger, +.btn-info, +.btn-success { + .caret { + border-top-color: @white; + .opacity(75); + } +} + +// Small button dropdowns +.btn-small .caret { + margin-top: 4px; +} + diff -r d0004f5eea59f83543349b161fdb4559d543b07c -r b1dac5a9b1d7d01a9e55940a4546fc5ed6f79bd0 static/june_2007_style/bootstrap/buttons.less --- /dev/null +++ b/static/june_2007_style/bootstrap/buttons.less @@ -0,0 +1,165 @@ +// BUTTON STYLES +// ------------- + + +// Base styles +// -------------------------------------------------- + +// Core +.btn { + display: inline-block; + padding: 4px 10px 4px; + font-size: @baseFontSize; + line-height: @baseLineHeight; + color: @grayDark; + text-align: center; + text-shadow: 0 1px 1px rgba(255,255,255,.75); + #gradient > .vertical-three-colors(@white, @white, 25%, darken(@white, 10%)); // Don't use .gradientbar() here since it does a three-color gradient + border: 1px solid #ccc; + border-bottom-color: #bbb; + .border-radius(4px); + @shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); + .box-shadow(@shadow); + cursor: pointer; + + // Give IE7 some love + .ie7-restore-left-whitespace(); +} + +// Hover state +.btn:hover { + color: @grayDark; + text-decoration: none; + background-color: darken(@white, 10%); + background-position: 0 -15px; + + // transition is only when going to hover, otherwise the background + // behind the gradient (there for IE<=9 fallback) gets mismatched + .transition(background-position .1s linear); +} + +// Focus state for keyboard and accessibility +.btn:focus { + .tab-focus(); +} + +// Active state +.btn.active, +.btn:active { + background-image: none; + @shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05); + .box-shadow(@shadow); + background-color: darken(@white, 10%); + background-color: darken(@white, 15%) e("\9"); + color: rgba(0,0,0,.5); + outline: 0; +} + +// Disabled state +.btn.disabled, +.btn[disabled] { + cursor: default; + background-image: none; + background-color: darken(@white, 10%); + .opacity(65); + .box-shadow(none); +} + + +// Button Sizes +// -------------------------------------------------- + +// Large +.btn-large { + padding: 9px 14px; + font-size: @baseFontSize + 2px; + line-height: normal; + .border-radius(5px); +} +.btn-large .icon { + margin-top: 1px; +} + +// Small +.btn-small { + padding: 5px 9px; + font-size: @baseFontSize - 2px; + line-height: @baseLineHeight - 2px; +} +.btn-small .icon { + margin-top: -1px; +} + + +// Alternate buttons +// -------------------------------------------------- + +// Set text color +// ------------------------- +.btn-primary, +.btn-primary:hover, +.btn-warning, +.btn-warning:hover, +.btn-danger, +.btn-danger:hover, +.btn-success, +.btn-success:hover, +.btn-info, +.btn-info:hover { + text-shadow: 0 -1px 0 rgba(0,0,0,.25); + color: @white; +} +// Provide *some* extra contrast for those who can get it +.btn-primary.active, +.btn-warning.active, +.btn-danger.active, +.btn-success.active, +.btn-info.active { + color: rgba(255,255,255,.75); +} + +// Set the backgrounds +// ------------------------- +.btn-primary { + .buttonBackground(@primaryButtonBackground, spin(@primaryButtonBackground, 20)); +} +// Warning appears are orange +.btn-warning { + .buttonBackground(lighten(@orange, 15%), @orange); +} +// Danger and error appear as red +.btn-danger { + .buttonBackground(#ee5f5b, #bd362f); +} +// Success appears as green +.btn-success { + .buttonBackground(#62c462, #51a351); +} +// Info appears as a neutral blue +.btn-info { + .buttonBackground(#5bc0de, #2f96b4); +} + + +// Cross-browser Jank +// -------------------------------------------------- + +button.btn, +input[type="submit"].btn { + &::-moz-focus-inner { + padding: 0; + border: 0; + } + + // IE7 has some default padding on button controls + *padding-top: 2px; + *padding-bottom: 2px; + &.large { + *padding-top: 7px; + *padding-bottom: 7px; + } + &.small { + *padding-top: 3px; + *padding-bottom: 3px; + } +} diff -r d0004f5eea59f83543349b161fdb4559d543b07c -r b1dac5a9b1d7d01a9e55940a4546fc5ed6f79bd0 static/june_2007_style/bootstrap/carousel.less --- /dev/null +++ b/static/june_2007_style/bootstrap/carousel.less @@ -0,0 +1,121 @@ +// CAROUSEL +// -------- + +.carousel { + position: relative; + margin-bottom: @baseLineHeight; + line-height: 1; +} + +.carousel-inner { + overflow: hidden; + width: 100%; + position: relative; +} + +.carousel { + + .item { + display: none; + position: relative; + .transition(.6s ease-in-out left); + } + + // Account for jankitude on images + .item > img { + display: block; + line-height: 1; + } + + .active, + .next, + .prev { display: block; } + + .active { + left: 0; + } + + .next, + .prev { + position: absolute; + top: 0; + width: 100%; + } + + .next { + left: 100%; + } + .prev { + left: -100%; + } + .next.left, + .prev.right { + left: 0; + } + + .active.left { + left: -100%; + } + .active.right { + left: 100%; + } + +} + +// Left/right controls for nav +// --------------------------- + +.carousel-control { + position: absolute; + top: 40%; + left: 15px; + width: 40px; + height: 40px; + margin-top: -20px; + font-size: 60px; + font-weight: 100; + line-height: 30px; + color: @white; + text-align: center; + background: @grayDarker; + border: 3px solid @white; + .border-radius(23px); + .opacity(50); + + // we can't have this transition here + // because webkit cancels the carousel + // animation if you trip this while + // in the middle of another animation + // ;_; + // .transition(opacity .2s linear); + + // Reposition the right one + &.right { + left: auto; + right: 15px; + } + + // Hover state + &:hover { + color: @white; + text-decoration: none; + .opacity(90); + } +} + +// Caption for text below images +// ----------------------------- + +.carousel-caption { + position: absolute; + left: 0; + right: 0; + bottom: 0; + padding: 10px 15px 5px; + background: @grayDark; + background: rgba(0,0,0,.75); +} +.carousel-caption h4, +.carousel-caption p { + color: @white; +} diff -r d0004f5eea59f83543349b161fdb4559d543b07c -r b1dac5a9b1d7d01a9e55940a4546fc5ed6f79bd0 static/june_2007_style/bootstrap/close.less --- /dev/null +++ b/static/june_2007_style/bootstrap/close.less @@ -0,0 +1,18 @@ +// CLOSE ICONS +// ----------- + +.close { + float: right; + font-size: 20px; + font-weight: bold; + line-height: @baseLineHeight; + color: @black; + text-shadow: 0 1px 0 rgba(255,255,255,1); + .opacity(20); + &:hover { + color: @black; + text-decoration: none; + .opacity(40); + cursor: pointer; + } +} diff -r d0004f5eea59f83543349b161fdb4559d543b07c -r b1dac5a9b1d7d01a9e55940a4546fc5ed6f79bd0 static/june_2007_style/bootstrap/code.less --- /dev/null +++ b/static/june_2007_style/bootstrap/code.less @@ -0,0 +1,44 @@ +// Code.less +// Code typography styles for the <code> and <pre> elements +// -------------------------------------------------------- + +// Inline and block code styles +code, +pre { + padding: 0 3px 2px; + #font > #family > .monospace; + font-size: @baseFontSize - 1; + color: @grayDark; + .border-radius(3px); +} +code { + padding: 3px 4px; + color: #d14; + background-color: #f7f7f9; + border: 1px solid #e1e1e8; +} +pre { + display: block; + padding: (@baseLineHeight - 1) / 2; + margin: 0 0 @baseLineHeight / 2; + font-size: 12px; + line-height: @baseLineHeight; + background-color: #f5f5f5; + border: 1px solid #ccc; // fallback for IE7-8 + border: 1px solid rgba(0,0,0,.15); + .border-radius(4px); + white-space: pre; + white-space: pre-wrap; + word-break: break-all; + + // Make prettyprint styles more spaced out for readability + &.prettyprint { + margin-bottom: @baseLineHeight; + } + + // Account for some code outputs that place code tags in pre tags + code { + padding: 0; + background-color: transparent; + } +} diff -r d0004f5eea59f83543349b161fdb4559d543b07c -r b1dac5a9b1d7d01a9e55940a4546fc5ed6f79bd0 static/june_2007_style/bootstrap/component-animations.less --- /dev/null +++ b/static/june_2007_style/bootstrap/component-animations.less @@ -0,0 +1,18 @@ +// COMPONENT ANIMATIONS +// -------------------- + +.fade { + .transition(opacity .15s linear); + opacity: 0; + &.in { + opacity: 1; + } +} + +.collapse { + .transition(height .35s ease); + position:relative; + overflow:hidden; + height: 0; + &.in { height: auto; } +} diff -r d0004f5eea59f83543349b161fdb4559d543b07c -r b1dac5a9b1d7d01a9e55940a4546fc5ed6f79bd0 static/june_2007_style/bootstrap/dropdowns.less --- /dev/null +++ b/static/june_2007_style/bootstrap/dropdowns.less @@ -0,0 +1,131 @@ +// DROPDOWN MENUS +// -------------- + +// Use the .menu class on any <li> element within the topbar or ul.tabs and you'll get some superfancy dropdowns +.dropdown { + position: relative; +} +.dropdown-toggle { + // The caret makes the toggle a bit too tall in IE7 + *margin-bottom: -3px; +} +.dropdown-toggle:active, +.open .dropdown-toggle { + outline: 0; +} +// Dropdown arrow/caret +.caret { + display: inline-block; + width: 0; + height: 0; + text-indent: -99999px; + // IE7 won't do the border trick if there's a text indent, but it doesn't + // do the content that text-indent is hiding, either, so we're ok. + *text-indent: 0; + vertical-align: top; + border-left: 4px solid transparent; + border-right: 4px solid transparent; + border-top: 4px solid @black; + .opacity(30); + content: "\2193"; +} +.dropdown .caret { + margin-top: 8px; + margin-left: 2px; +} +.dropdown:hover .caret, +.open.dropdown .caret { + .opacity(100); +} +// The dropdown menu (ul) +.dropdown-menu { + position: absolute; + top: 100%; + left: 0; + z-index: @zindexDropdown; + float: left; + display: none; // none by default, but block on "open" of the menu + min-width: 160px; + max-width: 220px; + _width: 160px; + padding: 4px 0; + margin: 0; // override default ul + list-style: none; + background-color: @white; + border-color: #ccc; + border-color: rgba(0,0,0,.2); + border-style: solid; + border-width: 1px; + .border-radius(0 0 5px 5px); + .box-shadow(0 5px 10px rgba(0,0,0,.2)); + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; + *border-right-width: 2px; + *border-bottom-width: 2px; + + // Allow for dropdowns to go bottom up (aka, dropup-menu) + &.bottom-up { + top: auto; + bottom: 100%; + margin-bottom: 2px; + } + + // Dividers (basically an hr) within the dropdown + .divider { + height: 1px; + margin: 5px 1px; + overflow: hidden; + background-color: #e5e5e5; + border-bottom: 1px solid @white; + + // IE7 needs a set width since we gave a height. Restricting just + // to IE7 to keep the 1px left/right space in other browsers. + // It is unclear where IE is getting the extra space that we need + // to negative-margin away, but so it goes. + *width: 100%; + *margin: -5px 0 5px; + } + + // Links within the dropdown menu + a { + display: block; + padding: 3px 15px; + clear: both; + font-weight: normal; + line-height: 18px; + color: @gray; + white-space: nowrap; + } +} + +// Hover state +.dropdown-menu li > a:hover, +.dropdown-menu .active > a, +.dropdown-menu .active > a:hover { + color: @white; + text-decoration: none; + background-color: @linkColor; +} + +// Open state for the dropdown +.dropdown.open { + // IE7's z-index only goes to the nearest positioned ancestor, which would + // make the menu appear below buttons that appeared later on the page + *z-index: @zindexDropdown; + + .dropdown-toggle { + color: @white; + background: #ccc; + background: rgba(0,0,0,.3); + } + .dropdown-menu { + display: block; + } +} + +// Typeahead +.typeahead { + margin-top: 2px; // give it some space to breathe + .border-radius(4px); +} diff -r d0004f5eea59f83543349b161fdb4559d543b07c -r b1dac5a9b1d7d01a9e55940a4546fc5ed6f79bd0 static/june_2007_style/bootstrap/forms.less --- /dev/null +++ b/static/june_2007_style/bootstrap/forms.less @@ -0,0 +1,515 @@ +// Forms.less +// Base styles for various input types, form layouts, and states +// ------------------------------------------------------------- + + +// GENERAL STYLES +// -------------- + +// Make all forms have space below them +form { + margin: 0 0 @baseLineHeight; +} + +fieldset { + padding: 0; + margin: 0; + border: 0; +} + +// Groups of fields with labels on top (legends) +legend { + display: block; + width: 100%; + padding: 0; + margin-bottom: @baseLineHeight * 1.5; + font-size: @baseFontSize * 1.5; + line-height: @baseLineHeight * 2; + color: @grayDark; + border: 0; + border-bottom: 1px solid #eee; +} + +// Set font for forms +label, +input, +button, +select, +textarea { + #font > .sans-serif(@baseFontSize,normal,@baseLineHeight); +} + +// Identify controls by their labels +label { + display: block; + margin-bottom: 5px; + color: @grayDark; +} + +// Inputs, Textareas, Selects +input, +textarea, +select, +.uneditable-input { + display: inline-block; + width: 210px; + height: @baseLineHeight; + padding: 4px; + margin-bottom: 9px; + font-size: @baseFontSize; + line-height: @baseLineHeight; + color: @gray; + border: 1px solid #ccc; + .border-radius(3px); +} +.uneditable-textarea { + width: auto; + height: auto; +} + +// Inputs within a label +label input, +label textarea, +label select { + display: block; +} + +// Mini reset for unique input types +input[type="image"], +input[type="checkbox"], +input[type="radio"] { + width: auto; + height: auto; + padding: 0; + margin: 3px 0; + *margin-top: 0; /* IE7 */ + line-height: normal; + border: 0; + cursor: pointer; + .border-radius(0); +} + +// Reset the file input to browser defaults +input[type="file"] { + padding: initial; + line-height: initial; + border: initial; + background-color: @white; + background-color: initial; + .box-shadow(none); +} + +// Help out input buttons +input[type="button"], +input[type="reset"], +input[type="submit"] { + width: auto; + height: auto; +} + +// Set the height of select and file controls to match text inputs +select, +input[type="file"] { + height: 28px; /* In IE7, the height of the select element cannot be changed by height, only font-size */ + *margin-top: 4px; /* For IE7, add top margin to align select with labels */ + line-height: 28px; +} + +// Chrome on Linux and Mobile Safari need background-color +select { + width: 220px; // default input width + 10px of padding that doesn't get applied + background-color: @white; +} + +// Make multiple select elements height not fixed +select[multiple], +select[size] { + height: auto; +} + +// Remove shadow from image inputs +input[type="image"] { + .box-shadow(none); +} + +// Make textarea height behave +textarea { + height: auto; +} + +// Hidden inputs +input[type="hidden"] { + display: none; +} + + + +// CHECKBOXES & RADIOS +// ------------------- + +// Indent the labels to position radios/checkboxes as hanging +.radio, +.checkbox { + padding-left: 18px; +} +.radio input[type="radio"], +.checkbox input[type="checkbox"] { + float: left; + margin-left: -18px; +} + +// Move the options list down to align with labels +.controls > .radio:first-child, +.controls > .checkbox:first-child { + padding-top: 5px; // has to be padding because margin collaspes +} + +// Radios and checkboxes on same line +.radio.inline, +.checkbox.inline { + display: inline-block; + margin-bottom: 0; + vertical-align: middle; +} +.radio.inline + .radio.inline, +.checkbox.inline + .checkbox.inline { + margin-left: 10px; // space out consecutive inline controls +} +// But don't forget to remove their padding on first-child +.controls > .radio.inline:first-child, +.controls > .checkbox.inline:first-child { + padding-top: 0; +} + + + +// FOCUS STATE +// ----------- + +input, +textarea { + .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); + @transition: border linear .2s, box-shadow linear .2s; + .transition(@transition); +} +input:focus, +textarea:focus { + border-color: rgba(82,168,236,.8); + @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); + .box-shadow(@shadow); + outline: 0; + outline: thin dotted \9; /* IE6-8 */ +} +input[type="file"]:focus, +input[type="checkbox"]:focus, +select:focus { + .box-shadow(none); // override for file inputs + .tab-focus(); +} + + + +// INPUT SIZES +// ----------- + +// General classes for quick sizes +.input-mini { width: 60px; } +.input-small { width: 90px; } +.input-medium { width: 150px; } +.input-large { width: 210px; } +.input-xlarge { width: 270px; } +.input-xxlarge { width: 530px; } + +// Grid style input sizes +input[class*="span"], +select[class*="span"], +textarea[class*="span"], +.uneditable-input { + float: none; + margin-left: 0; +} + + + +// GRID SIZING FOR INPUTS +// ---------------------- + +#inputGridSystem > .generate(@gridColumns, @gridColumnWidth, @gridGutterWidth); + + + + +// DISABLED STATE +// -------------- + +// Disabled and read-only inputs +input[disabled], +select[disabled], +textarea[disabled], +input[readonly], +select[readonly], +textarea[readonly] { + background-color: #f5f5f5; + border-color: #ddd; + cursor: not-allowed; +} + + + + +// FORM FIELD FEEDBACK STATES +// -------------------------- + +// Mixin for form field states +.formFieldState(@textColor: #555, @borderColor: #ccc, @backgroundColor: #f5f5f5) { + // Set the text color + > label, + .help-block, + .help-inline { + color: @textColor; + } + // Style inputs accordingly + input, + select, + textarea { + color: @textColor; + border-color: @borderColor; + &:focus { + border-color: darken(@borderColor, 10%); + .box-shadow(0 0 6px lighten(@borderColor, 20%)); + } + } + // Give a small background color for input-prepend/-append + .input-prepend .add-on, + .input-append .add-on { + color: @textColor; + background-color: @backgroundColor; + border-color: @textColor; + } +} +// Warning +.control-group.warning { + .formFieldState(@warningText, @warningText, @warningBackground); +} +// Error +.control-group.error { + .formFieldState(@errorText, @errorText, @errorBackground); +} +// Success +.control-group.success { + .formFieldState(@successText, @successText, @successBackground); +} + +// HTML5 invalid states +// Shares styles with the .control-group.error above +input:focus:required:invalid, +textarea:focus:required:invalid, +select:focus:required:invalid { + color: #b94a48; + border-color: #ee5f5b; + &:focus { + border-color: darken(#ee5f5b, 10%); + .box-shadow(0 0 6px lighten(#ee5f5b, 20%)); + } +} + + + +// FORM ACTIONS +// ------------ + +.form-actions { + padding: (@baseLineHeight - 1) 20px @baseLineHeight; + margin-top: @baseLineHeight; + margin-bottom: @baseLineHeight; + background-color: #f5f5f5; + border-top: 1px solid #ddd; +} + +// For text that needs to appear as an input but should not be an input +.uneditable-input { + display: block; + background-color: @white; + border-color: #eee; + .box-shadow(inset 0 1px 2px rgba(0,0,0,.025)); + cursor: not-allowed; +} + +// Placeholder text gets special styles; can't be bundled together though for some reason +.placeholder(@grayLight); + + + +// HELP TEXT +// --------- + +.help-block { + margin-top: 5px; + margin-bottom: 0; + color: @grayLight; +} + +.help-inline { + display: inline-block; + .ie7-inline-block(); + margin-bottom: 9px; + vertical-align: middle; + padding-left: 5px; +} + + + +// INPUT GROUPS +// ------------ + +// Allow us to put symbols and text within the input field for a cleaner look +.input-prepend, +.input-append { + margin-bottom: 5px; + .clearfix(); // Clear the float to prevent wrapping + input, + .uneditable-input { + .border-radius(0 3px 3px 0); + &:focus { + position: relative; + z-index: 2; + } + } + .uneditable-input { + border-left-color: #ccc; + } + .add-on { + float: left; + display: block; + width: auto; + min-width: 16px; + height: @baseLineHeight; + margin-right: -1px; + padding: 4px 5px; + font-weight: normal; + line-height: @baseLineHeight; + color: @grayLight; + text-align: center; + text-shadow: 0 1px 0 @white; + background-color: #f5f5f5; + border: 1px solid #ccc; + .border-radius(3px 0 0 3px); + } + .active { + background-color: lighten(@green, 30); + border-color: @green; + } +} +.input-prepend { + .add-on { + *margin-top: 1px; /* IE6-7 */ + } +} +.input-append { + input, + .uneditable-input { + float: left; + .border-radius(3px 0 0 3px); + } + .uneditable-input { + border-right-color: #ccc; + } + .add-on { + margin-right: 0; + margin-left: -1px; + .border-radius(0 3px 3px 0); + } + input:first-child { + // In IE7, having a hasLayout container (from clearfix's zoom:1) can make the first input + // inherit the sum of its ancestors' margins. + *margin-left: -160px; + + &+.add-on { + *margin-left: -21px; + } + } +} + + + +// SEARCH FORM +// ----------- + +.search-query { + padding-left: 14px; + padding-right: 14px; + margin-bottom: 0; // remove the default margin on all inputs + .border-radius(14px); +} + + + +// HORIZONTAL & VERTICAL FORMS +// --------------------------- + +// Common properties +// ----------------- + +.form-search, +.form-inline, +.form-horizontal { + input, + textarea, + select, + .help-inline, + .uneditable-input { + display: inline-block; + margin-bottom: 0; + } +} +.form-search label, +.form-inline label, +.form-search .input-append, +.form-inline .input-append, +.form-search .input-prepend, +.form-inline .input-prepend { + display: inline-block; +} +// Make the prepend and append add-on vertical-align: middle; +.form-search .input-append .add-on, +.form-inline .input-prepend .add-on, +.form-search .input-append .add-on, +.form-inline .input-prepend .add-on { + vertical-align: middle; +} + +// Margin to space out fieldsets +.control-group { + margin-bottom: @baseLineHeight / 2; +} + +// Horizontal-specific styles +// -------------------------- + +.form-horizontal { + // Legend collapses margin, so we're relegated to padding + legend + .control-group { + margin-top: @baseLineHeight; + -webkit-margin-top-collapse: separate; + } + // Increase spacing between groups + .control-group { + margin-bottom: @baseLineHeight; + .clearfix(); + } + // Float the labels left + .control-group > label { + float: left; + width: 140px; + padding-top: 5px; + text-align: right; + } + // Move over all input controls and content + .controls { + margin-left: 160px; + } + // Move over buttons in .form-actions to align with .controls + .form-actions { + padding-left: 160px; + } +} diff -r d0004f5eea59f83543349b161fdb4559d543b07c -r b1dac5a9b1d7d01a9e55940a4546fc5ed6f79bd0 static/june_2007_style/bootstrap/grid.less --- /dev/null +++ b/static/june_2007_style/bootstrap/grid.less @@ -0,0 +1,8 @@ +// GRID SYSTEM +// ----------- + +// Fixed (940px) +#gridSystem > .generate(@gridColumns, @gridColumnWidth, @gridGutterWidth); + +// Fluid (940px) +#fluidGridSystem > .generate(@gridColumns, @fluidGridColumnWidth, @fluidGridGutterWidth); diff -r d0004f5eea59f83543349b161fdb4559d543b07c -r b1dac5a9b1d7d01a9e55940a4546fc5ed6f79bd0 static/june_2007_style/bootstrap/hero-unit.less --- /dev/null +++ b/static/june_2007_style/bootstrap/hero-unit.less @@ -0,0 +1,20 @@ +// HERO UNIT +// --------- + +.hero-unit { + padding: 60px; + margin-bottom: 30px; + background-color: #f5f5f5; + .border-radius(6px); + h1 { + margin-bottom: 0; + font-size: 60px; + line-height: 1; + letter-spacing: -1px; + } + p { + font-size: 18px; + font-weight: 200; + line-height: @baseLineHeight * 1.5; + } +} diff -r d0004f5eea59f83543349b161fdb4559d543b07c -r b1dac5a9b1d7d01a9e55940a4546fc5ed6f79bd0 static/june_2007_style/bootstrap/labels.less --- /dev/null +++ b/static/june_2007_style/bootstrap/labels.less @@ -0,0 +1,16 @@ +// LABELS +// ------ + +.label { + padding: 1px 3px 2px; + font-size: @baseFontSize * .75; + font-weight: bold; + color: @white; + text-transform: uppercase; + background-color: @grayLight; + .border-radius(3px); +} +.label-important { background-color: @errorText; } +.label-warning { background-color: @orange; } +.label-success { background-color: @successText; } +.label-info { background-color: @infoText; } diff -r d0004f5eea59f83543349b161fdb4559d543b07c -r b1dac5a9b1d7d01a9e55940a4546fc5ed6f79bd0 static/june_2007_style/bootstrap/layouts.less --- /dev/null +++ b/static/june_2007_style/bootstrap/layouts.less @@ -0,0 +1,17 @@ +// +// Layouts +// Fixed-width and fluid (with sidebar) layouts +// -------------------------------------------- + + +// Container (centered, fixed-width layouts) +.container { + .container-fixed(); +} + +// Fluid layouts (left aligned, with sidebar, min- & max-width content) +.container-fluid { + padding-left: @gridGutterWidth; + padding-right: @gridGutterWidth; + .clearfix(); +} \ No newline at end of file diff -r d0004f5eea59f83543349b161fdb4559d543b07c -r b1dac5a9b1d7d01a9e55940a4546fc5ed6f79bd0 static/june_2007_style/bootstrap/mixins.less --- /dev/null +++ b/static/june_2007_style/bootstrap/mixins.less @@ -0,0 +1,537 @@ +// Mixins.less +// Snippets of reusable CSS to develop faster and keep code readable +// ----------------------------------------------------------------- + + +// UTILITY MIXINS +// -------------------------------------------------- + +// Clearfix +// -------- +// For clearing floats like a boss h5bp.com/q +.clearfix() { + *zoom: 1; + &:before, + &:after { + display: table; + content: ""; + } + &:after { + clear: both; + } +} + +// Webkit-style focus +// ------------------ +.tab-focus() { + // Default + outline: thin dotted; + // Webkit + outline: 5px auto -webkit-focus-ring-color; + outline-offset: -2px; +} + +// Center-align a block level element +// ---------------------------------- +.center-block() { + display: block; + margin-left: auto; + margin-right: auto; +} + +// IE7 inline-block +// ---------------- +.ie7-inline-block() { + *display: inline; /* IE7 inline-block hack */ + *zoom: 1; +} + +// IE7 likes to collapse whitespace on either side of the inline-block elements. +// Ems because we're attempting to match the width of a space character. Left +// version is for form buttons, which typically come after other elements, and +// right version is for icons, which come before. Applying both is ok, but it will +// mean that space between those elements will be .6em (~2 space characters) in IE7, +// instead of the 1 space in other browsers. +.ie7-restore-left-whitespace() { + *margin-left: .3em; + + &:first-child { + *margin-left: 0; + } +} + +.ie7-restore-right-whitespace() { + *margin-right: .3em; + + &:last-child { + *margin-left: 0; + } +} + +// Sizing shortcuts +// ------------------------- +.size(@height: 5px, @width: 5px) { + width: @width; + height: @height; +} +.square(@size: 5px) { + .size(@size, @size); +} + +// Placeholder text +// ------------------------- +.placeholder(@color: @placeholderText) { + :-moz-placeholder { + color: @color; + } + ::-webkit-input-placeholder { + color: @color; + } +} + + + +// FONTS +// -------------------------------------------------- + +#font { + #family { + .serif() { + font-family: Georgia, "Times New Roman", Times, serif; + } + .sans-serif() { + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + } + .monospace() { + font-family: Menlo, Monaco, "Courier New", monospace; + } + } + .shorthand(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) { + font-size: @size; + font-weight: @weight; + line-height: @lineHeight; + } + .serif(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) { + #font > #family > .serif; + #font > .shorthand(@size, @weight, @lineHeight); + } + .sans-serif(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) { + #font > #family > .sans-serif; + #font > .shorthand(@size, @weight, @lineHeight); + } + .monospace(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) { + #font > #family > .monospace; + #font > .shorthand(@size, @weight, @lineHeight); + } +} + + + +// GRID SYSTEM +// -------------------------------------------------- + +// Site container +// ------------------------- +.container-fixed() { + width: @gridRowWidth; + margin-left: auto; + margin-right: auto; + .clearfix(); +} + +// Le grid system +// ------------------------- +#gridSystem { + // Setup the mixins to be used + .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, @columns) { + width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)); + } + .offset(@gridColumnWidth, @gridGutterWidth, @columns) { + margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) + (@gridGutterWidth * 2); + } + .gridColumn(@gridGutterWidth) { + float: left; + margin-left: @gridGutterWidth; + } + // Take these values and mixins, and make 'em do their thang + .generate(@gridColumns, @gridColumnWidth, @gridGutterWidth) { + // Row surrounds the columns + .row { + margin-left: @gridGutterWidth * -1; + .clearfix(); + } + // Find all .span# classes within .row and give them the necessary properties for grid columns (supported by all browsers back to IE7, thanks @dhg) + [class*="span"] { + #gridSystem > .gridColumn(@gridGutterWidth); + } + // Default columns + .span1 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 1); } + .span2 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 2); } + .span3 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 3); } + .span4 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 4); } + .span5 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 5); } + .span6 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 6); } + .span7 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 7); } + .span8 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 8); } + .span9 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 9); } + .span10 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 10); } + .span11 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 11); } + .span12, + .container { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 12); } + // Offset column options + .offset1 { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 1); } + .offset2 { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 2); } + .offset3 { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 3); } + .offset4 { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 4); } + .offset5 { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 5); } + .offset6 { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 6); } + .offset7 { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 7); } + .offset8 { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 8); } + .offset9 { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 9); } + .offset10 { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 10); } + .offset11 { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 11); } + } +} + +// Fluid grid system +// ------------------------- +#fluidGridSystem { + // Setup the mixins to be used + .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, @columns) { + width: 1% * (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)); + } + .gridColumn(@fluidGridGutterWidth) { + float: left; + margin-left: @fluidGridGutterWidth; + } + // Take these values and mixins, and make 'em do their thang + .generate(@gridColumns, @fluidGridColumnWidth, @fluidGridGutterWidth) { + // Row surrounds the columns + .row-fluid { + width: 100%; + .clearfix(); + + // Find all .span# classes within .row and give them the necessary properties for grid columns (supported by all browsers back to IE7, thanks @dhg) + > [class*="span"] { + #fluidGridSystem > .gridColumn(@fluidGridGutterWidth); + } + > [class*="span"]:first-child { + margin-left: 0; + } + // Default columns + .span1 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 1); } + .span2 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 2); } + .span3 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 3); } + .span4 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 4); } + .span5 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 5); } + .span6 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 6); } + .span7 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 7); } + .span8 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 8); } + .span9 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 9); } + .span10 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 10); } + .span11 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 11); } + .span12 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 12); } + } + } +} + + + +// Input grid system +// ------------------------- +#inputGridSystem { + .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, @columns) { + width: ((@gridColumnWidth) * @columns) + (@gridGutterWidth * (@columns - 1)) - 10; + } + .generate(@gridColumns, @gridColumnWidth, @gridGutterWidth) { + input, + textarea, + .uneditable-input { + &.span1 { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 1); } + &.span2 { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 2); } + &.span3 { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 3); } + &.span4 { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 4); } + &.span5 { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 5); } + &.span6 { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 6); } + &.span7 { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 7); } + &.span8 { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 8); } + &.span9 { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 9); } + &.span10 { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 10); } + &.span11 { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 11); } + &.span12 { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 12); } + } + } +} + + + +// CSS3 PROPERTIES +// -------------------------------------------------- + +// Border Radius +.border-radius(@radius: 5px) { + -webkit-border-radius: @radius; + -moz-border-radius: @radius; + border-radius: @radius; +} + +// Drop shadows +.box-shadow(@shadow: 0 1px 3px rgba(0,0,0,.25)) { + -webkit-box-shadow: @shadow; + -moz-box-shadow: @shadow; + box-shadow: @shadow; +} + +// Transitions +.transition(@transition) { + -webkit-transition: @transition; + -moz-transition: @transition; + -ms-transition: @transition; + -o-transition: @transition; + transition: @transition; +} + +// Transformations +.rotate(@degrees) { + -webkit-transform: rotate(@degrees); + -moz-transform: rotate(@degrees); + -ms-transform: rotate(@degrees); + -o-transform: rotate(@degrees); + transform: rotate(@degrees); +} +.scale(@ratio) { + -webkit-transform: scale(@ratio); + -moz-transform: scale(@ratio); + -ms-transform: scale(@ratio); + -o-transform: scale(@ratio); + transform: scale(@ratio); +} +.translate(@x: 0, @y: 0) { + -webkit-transform: translate(@x, @y); + -moz-transform: translate(@x, @y); + -ms-transform: translate(@x, @y); + -o-transform: translate(@x, @y); + transform: translate(@x, @y); +} +.skew(@x: 0, @y: 0) { + -webkit-transform: translate(@x, @y); + -moz-transform: translate(@x, @y); + -ms-transform: translate(@x, @y); + -o-transform: translate(@x, @y); + transform: translate(@x, @y); +} +.skew(@x: 0, @y: 0) { + -webkit-transform: skew(@x, @y); + -moz-transform: skew(@x, @y); + -ms-transform: skew(@x, @y); + -o-transform: skew(@x, @y); + transform: skew(@x, @y); +} + +// Background clipping +// Heads up: FF 3.6 and under need "padding" instead of "padding-box" +.background-clip(@clip) { + -webkit-background-clip: @clip; + -moz-background-clip: @clip; + background-clip: @clip; +} + +// Background sizing +.background-size(@size){ + -webkit-background-size: @size; + -moz-background-size: @size; + -o-background-size: @size; + background-size: @size; +} + + +// Box sizing +.box-sizing(@boxmodel) { + -webkit-box-sizing: @boxmodel; + -moz-box-sizing: @boxmodel; + box-sizing: @boxmodel; +} + +// User select +// For selecting text on the page +.user-select(@select) { + -webkit-user-select: @select; + -moz-user-select: @select; + -o-user-select: @select; + user-select: @select; +} + +// Resize anything +.resizable(@direction: both) { + resize: @direction; // Options: horizontal, vertical, both + overflow: auto; // Safari fix +} + +// CSS3 Content Columns +.content-columns(@columnCount, @columnGap: @gridColumnGutter) { + -webkit-column-count: @columnCount; + -moz-column-count: @columnCount; + column-count: @columnCount; + -webkit-column-gap: @columnGap; + -moz-column-gap: @columnGap; + column-gap: @columnGap; +} + +// Opacity +.opacity(@opacity: 100) { + opacity: @opacity / 100; + filter: e(%("alpha(opacity=%d)", @opacity)); +} + + + +// BACKGROUNDS +// -------------------------------------------------- + +// Add an alphatransparency value to any background or border color (via Elyse Holladay) +#translucent { + .background(@color: @white, @alpha: 1) { + background-color: hsla(hue(@color), saturation(@color), lightness(@color), @alpha); + } + .border(@color: @white, @alpha: 1) { + border-color: hsla(hue(@color), saturation(@color), lightness(@color), @alpha); + .background-clip(padding-box); + } +} + +// Gradient Bar Colors for buttons and alerts +.gradientBar(@primaryColor, @secondaryColor) { + #gradient > .vertical(@primaryColor, @secondaryColor); + border-color: @secondaryColor @secondaryColor darken(@secondaryColor, 15%); + border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%); +} + +// Gradients +#gradient { + .horizontal(@startColor: #555, @endColor: #333) { + background-color: @endColor; + background-image: -moz-linear-gradient(left, @startColor, @endColor); // FF 3.6+ + background-image: -ms-linear-gradient(left, @startColor, @endColor); // IE10 + background-image: -webkit-gradient(linear, 0 0, 100% 0, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+ + background-image: -webkit-linear-gradient(left, @startColor, @endColor); // Safari 5.1+, Chrome 10+ + background-image: -o-linear-gradient(left, @startColor, @endColor); // Opera 11.10 + background-image: linear-gradient(left, @startColor, @endColor); // Le standard + background-repeat: repeat-x; + filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",@startColor,@endColor)); // IE9 and down + } + .vertical(@startColor: #555, @endColor: #333) { + background-color: mix(@startColor, @endColor, 60%); + background-image: -moz-linear-gradient(top, @startColor, @endColor); // FF 3.6+ + background-image: -ms-linear-gradient(top, @startColor, @endColor); // IE10 + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+ + background-image: -webkit-linear-gradient(top, @startColor, @endColor); // Safari 5.1+, Chrome 10+ + background-image: -o-linear-gradient(top, @startColor, @endColor); // Opera 11.10 + background-image: linear-gradient(top, @startColor, @endColor); // The standard + background-repeat: repeat-x; + filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); // IE9 and down + } + .directional(@startColor: #555, @endColor: #333, @deg: 45deg) { + background-color: @endColor; + background-repeat: repeat-x; + background-image: -moz-linear-gradient(@deg, @startColor, @endColor); // FF 3.6+ + background-image: -ms-linear-gradient(@deg, @startColor, @endColor); // IE10 + background-image: -webkit-linear-gradient(@deg, @startColor, @endColor); // Safari 5.1+, Chrome 10+ + background-image: -o-linear-gradient(@deg, @startColor, @endColor); // Opera 11.10 + background-image: linear-gradient(@deg, @startColor, @endColor); // The standard + } + .vertical-three-colors(@startColor: #00b3ee, @midColor: #7a43b6, @colorStop: 50%, @endColor: #c3325f) { + background-color: mix(@midColor, @endColor, 80%); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), color-stop(@colorStop, @midColor), to(@endColor)); + background-image: -webkit-linear-gradient(@startColor, @midColor @colorStop, @endColor); + background-image: -moz-linear-gradient(top, @startColor, @midColor @colorStop, @endColor); + background-image: -ms-linear-gradient(@startColor, @midColor @colorStop, @endColor); + background-image: -o-linear-gradient(@startColor, @midColor @colorStop, @endColor); + background-image: linear-gradient(@startColor, @midColor @colorStop, @endColor); + background-repeat: no-repeat; + filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); // IE9 and down, gets no color-stop at all for proper fallback + } + .radial(@innerColor: #555, @outerColor: #333) { + background-color: @outerColor; + background-image: -webkit-gradient(radial, center center, 0, center center, 460, from(@innerColor), to(@outerColor)); + background-image: -webkit-radial-gradient(circle, @innerColor, @outerColor); + background-image: -moz-radial-gradient(circle, @innerColor, @outerColor); + background-image: -ms-radial-gradient(circle, @innerColor, @outerColor); + background-repeat: no-repeat; + // Opera cannot do radial gradients yet + } + .striped(@color, @angle: -45deg) { + background-color: @color; + background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, rgba(255,255,255,.15)), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, rgba(255,255,255,.15)), color-stop(.75, rgba(255,255,255,.15)), color-stop(.75, transparent), to(transparent)); + background-image: -webkit-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); + background-image: -ms-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); + } +} +// Reset filters for IE +.reset-filter() { + filter: e(%("progid:DXImageTransform.Microsoft.gradient(enabled = false)")); +} + + +// Mixin for generating button backgrounds +// --------------------------------------- +.buttonBackground(@startColor, @endColor) { + // gradientBar will set the background to a pleasing blend of these, to support IE<=9 + .gradientBar(@startColor, @endColor); + .reset-filter(); + + // in these cases the gradient won't cover the background, so we override + &:hover, &:active, &.active, &.disabled, &[disabled] { + background-color: @endColor; + } + + // IE 7 + 8 can't handle box-shadow to show active, so we darken a bit ourselves + &:active, + &.active { + background-color: darken(@endColor, 10%) e("\9"); + } +} + + +// COMPONENT MIXINS +// -------------------------------------------------- + +// POPOVER ARROWS +// ------------------------- +// For tipsies and popovers +#popoverArrow { + .top(@arrowWidth: 5px) { + bottom: 0; + left: 50%; + margin-left: -@arrowWidth; + border-left: @arrowWidth solid transparent; + border-right: @arrowWidth solid transparent; + border-top: @arrowWidth solid @black; + } + .left(@arrowWidth: 5px) { + top: 50%; + right: 0; + margin-top: -@arrowWidth; + border-top: @arrowWidth solid transparent; + border-bottom: @arrowWidth solid transparent; + border-left: @arrowWidth solid @black; + } + .bottom(@arrowWidth: 5px) { + top: 0; + left: 50%; + margin-left: -@arrowWidth; + border-left: @arrowWidth solid transparent; + border-right: @arrowWidth solid transparent; + border-bottom: @arrowWidth solid @black; + } + .right(@arrowWidth: 5px) { + top: 50%; + left: 0; + margin-top: -@arrowWidth; + border-top: @arrowWidth solid transparent; + border-bottom: @arrowWidth solid transparent; + border-right: @arrowWidth solid @black; + } +} diff -r d0004f5eea59f83543349b161fdb4559d543b07c -r b1dac5a9b1d7d01a9e55940a4546fc5ed6f79bd0 static/june_2007_style/bootstrap/modals.less --- /dev/null +++ b/static/june_2007_style/bootstrap/modals.less @@ -0,0 +1,72 @@ +// MODALS +// ------ + +.modal-open { + .dropdown-menu { z-index: @zindexDropdown + @zindexModal; } + .dropdown.open { *z-index: @zindexDropdown + @zindexModal; } + .popover { z-index: @zindexPopover + @zindexModal; } + .tooltip { z-index: @zindexTooltip + @zindexModal; } +} + +.modal-backdrop { + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; + z-index: @zindexModalBackdrop; + background-color: @black; + // Fade for backdrop + &.fade { opacity: 0; } +} + +.modal-backdrop, +.modal-backdrop.fade.in { + .opacity(80); +} + +.modal { + position: fixed; + top: 50%; + left: 50%; + z-index: @zindexModal; + max-height: 500px; + overflow: auto; + width: 560px; + margin: -250px 0 0 -280px; + background-color: @white; + border: 1px solid #999; + border: 1px solid rgba(0,0,0,.3); + *border: 1px solid #999; /* IE6-7 */ + .border-radius(6px); + .box-shadow(0 3px 7px rgba(0,0,0,0.3)); + .background-clip(padding-box); + &.fade { + .transition(e('opacity .3s linear, top .3s ease-out')); + top: -25%; + } + &.fade.in { top: 50%; } +} +.modal-header { + padding: 9px 15px; + border-bottom: 1px solid #eee; + // Close icon + .close { margin-top: 2px; } +} +.modal-body { + padding: 15px; +} +.modal-footer { + padding: 14px 15px 15px; + margin-bottom: 0; + background-color: #f5f5f5; + border-top: 1px solid #ddd; + .border-radius(0 0 6px 6px); + .box-shadow(inset 0 1px 0 @white); + .clearfix(); + .btn { + float: right; + margin-left: 5px; + margin-bottom: 0; // account for input[type="submit"] which gets the bottom margin like all other inputs + } +} diff -r d0004f5eea59f83543349b161fdb4559d543b07c -r b1dac5a9b1d7d01a9e55940a4546fc5ed6f79bd0 static/june_2007_style/bootstrap/navbar.less --- /dev/null +++ b/static/june_2007_style/bootstrap/navbar.less @@ -0,0 +1,292 @@ +// NAVBAR (FIXED AND STATIC) +// ------------------------- + + +// COMMON STYLES +// ------------- + +.navbar { + overflow: visible; + margin-bottom: @baseLineHeight; +} + +// Gradient is applied to it's own element because overflow visible is not honored by IE when filter is present +.navbar-inner { + padding-left: 20px; + padding-right: 20px; + #gradient > .vertical(@navbarBackgroundHighlight, @navbarBackground); + .border-radius(4px); + @shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1); + .box-shadow(@shadow); +} + +// Navbar button for toggling navbar items in responsive layouts +.btn-navbar { + display: none; + float: right; + padding: 7px 10px; + margin-left: 5px; + margin-right: 5px; + .buttonBackground(@navbarBackgroundHighlight, @navbarBackground); + @shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075); + .box-shadow(@shadow); +} +.btn-navbar .icon-bar { + display: block; + width: 18px; + height: 2px; + background-color: #f5f5f5; + .border-radius(1px); + .box-shadow(0 1px 0 rgba(0,0,0,.25)); +} +.btn-navbar .icon-bar + .icon-bar { + margin-top: 3px; +} +// Override the default collapsed state +.nav-collapse.collapse { + height: auto; +} + + +// Brand, links, text, and buttons +.navbar { + // Hover and active states + .brand:hover { + text-decoration: none; + } + // Website or project name + .brand { + float: left; + display: block; + padding: 8px 20px 12px; + margin-left: -20px; // negative indent to left-align the text down the page + font-size: 20px; + font-weight: 200; + line-height: 1; + color: @white; + } + // Plain text in topbar + .navbar-text { + margin-bottom: 0; + line-height: 40px; + color: @navbarText; + a:hover { + color: @white; + background-color: transparent; + } + } + // Buttons in navbar + .btn, + .btn-group { + margin-top: 5px; // make buttons vertically centered in navbar + } + .btn-group .btn { + margin-top: 0; + } +} + +// Navbar forms +.navbar-form { + margin-bottom: 0; // remove default bottom margin + .clearfix(); + input, + select { + display: inline-block; + margin-top: 5px; + margin-bottom: 0; + } + .radio, + .checkbox { + margin-top: 5px; + } + input[type="image"], + input[type="checkbox"], + input[type="radio"] { + margin-top: 3px; + } +} + +// Navbar search +.navbar-search { + position: relative; + float: left; + margin-top: 6px; + margin-bottom: 0; + .search-query { + padding: 4px 9px; + #font > .sans-serif(13px, normal, 1); + color: @white; + color: rgba(255,255,255,.75); + background: #666; + background: rgba(255,255,255,.3); + border: 1px solid #111; + @shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15); + .box-shadow(@shadow); + .transition(none); + + // Placeholder text gets special styles; can't be bundled together though for some reason + .placeholder(@grayLighter); + + // Hover states + &:hover { + color: @white; + background-color: @grayLight; + background-color: rgba(255,255,255,.5); + } + // Focus states (we use .focused since IE8 and down doesn't support :focus) + &:focus, + &.focused { + padding: 5px 10px; + color: @grayDark; + text-shadow: 0 1px 0 @white; + background-color: @white; + border: 0; + .box-shadow(0 0 3px rgba(0,0,0,.15)); + outline: 0; + } + } +} + + +// FIXED NAVBAR +// ------------ + +.navbar-fixed-top { + position: fixed; + top: 0; + right: 0; + left: 0; + z-index: @zindexFixedNavbar; +} +.navbar-fixed-top .navbar-inner { + padding-left: 0; + padding-right: 0; + .border-radius(0); +} + + +// NAVIGATION +// ---------- + +.navbar .nav { + position: relative; + left: 0; + display: block; + float: left; + margin: 0 10px 0 0; +} +.navbar .nav.pull-right { + float: right; // redeclare due to specificity +} +.navbar .nav > li { + display: block; + float: left; +} + +// Links +.navbar .nav > li > a { + float: none; + padding: 10px 10px 11px; + line-height: 19px; + color: @navbarLinkColor; + text-decoration: none; + text-shadow: 0 -1px 0 rgba(0,0,0,.25); +} +// Hover +.navbar .nav > li > a:hover { + background-color: transparent; + color: @navbarLinkColorHover; + text-decoration: none; +} + +// Active nav items +.navbar .nav .active > a, +.navbar .nav .active > a:hover { + color: @navbarLinkColorHover; + text-decoration: none; + background-color: @navbarBackground; + background-color: rgba(0,0,0,.5); +} + +// Dividers (basically a vertical hr) +.navbar .divider-vertical { + height: @navbarHeight; + width: 1px; + margin: 0 9px; + overflow: hidden; + background-color: @navbarBackground; + border-right: 1px solid @navbarBackgroundHighlight; +} + +// Secondary (floated right) nav in topbar +.navbar .nav.pull-right { + margin-left: 10px; + margin-right: 0; +} + + + +// Dropdown menus +// -------------- + +// Menu position and menu carets +.navbar .dropdown-menu { + margin-top: 1px; + .border-radius(4px); + &:before { + content: ''; + display: inline-block; + border-left: 7px solid transparent; + border-right: 7px solid transparent; + border-bottom: 7px solid #ccc; + border-bottom-color: rgba(0,0,0,.2); + position: absolute; + top: -7px; + left: 9px; + } + &:after { + content: ''; + display: inline-block; + border-left: 6px solid transparent; + border-right: 6px solid transparent; + border-bottom: 6px solid @white; + position: absolute; + top: -6px; + left: 10px; + } +} + +// Dropdown toggle caret +.navbar .nav .dropdown-toggle .caret, +.navbar .nav .open.dropdown .caret { + border-top-color: @white; +} +.navbar .nav .active .caret { + .opacity(100); +} + +// Remove background color from open dropdown +.navbar .nav .open > .dropdown-toggle, +.navbar .nav .active > .dropdown-toggle, +.navbar .nav .open.active > .dropdown-toggle { + background-color: transparent; +} + +// Dropdown link on hover +.navbar .nav .active > .dropdown-toggle:hover { + color: @white; +} + +// Right aligned menus need alt position +.navbar .nav.pull-right .dropdown-menu { + left: auto; + right: 0; + &:before { + left: auto; + right: 12px; + } + &:after { + left: auto; + right: 13px; + } +} \ No newline at end of file diff -r d0004f5eea59f83543349b161fdb4559d543b07c -r b1dac5a9b1d7d01a9e55940a4546fc5ed6f79bd0 static/june_2007_style/bootstrap/navs.less --- /dev/null +++ b/static/june_2007_style/bootstrap/navs.less @@ -0,0 +1,344 @@ +// NAVIGATIONS +// ----------- + + + +// BASE CLASS +// ---------- + +.nav { + margin-left: 0; + margin-bottom: @baseLineHeight; + list-style: none; +} + +// Make links block level +.nav > li > a { + display: block; +} +.nav > li > a:hover { + text-decoration: none; + background-color: @grayLighter; +} + + + +// NAV LIST +// -------- + +.nav-list { + padding-left: 14px; + padding-right: 14px; + margin-bottom: 0; +} +.nav-list > li > a, +.nav-list .nav-header { + display: block; + padding: 3px 15px; + margin-left: -15px; + margin-right: -15px; + text-shadow: 0 1px 0 rgba(255,255,255,.5); +} +.nav-list .nav-header { + font-size: 11px; + font-weight: bold; + line-height: @baseLineHeight; + color: @grayLight; + text-transform: uppercase; +} +.nav-list > li + .nav-header { + margin-top: 9px; +} +.nav-list .active > a, +.nav-list .active > a:hover { + color: @white; + text-shadow: 0 -1px 0 rgba(0,0,0,.2); + background-color: @linkColor; +} +.nav-list [class^="icon-"] { + margin-right: 2px; +} + + + +// TABS AND PILLS +// ------------- + +// Common styles +.nav-tabs, +.nav-pills { + .clearfix(); +} +.nav-tabs > li, +.nav-pills > li { + float: left; +} +.nav-tabs > li > a, +.nav-pills > li > a { + padding-right: 12px; + padding-left: 12px; + margin-right: 2px; + line-height: 14px; // keeps the overall height an even number +} + +// TABS +// ---- + +// Give the tabs something to sit on +.nav-tabs { + border-bottom: 1px solid #ddd; +} + +// Make the list-items overlay the bottom border +.nav-tabs > li { + margin-bottom: -1px; +} + +// Actual tabs (as links) +.nav-tabs > li > a { + padding-top: 9px; + padding-bottom: 9px; + border: 1px solid transparent; + .border-radius(4px 4px 0 0); + &:hover { + border-color: @grayLighter @grayLighter #ddd; + } +} +// Active state, and it's :hover to override normal :hover +.nav-tabs > .active > a, +.nav-tabs > .active > a:hover { + color: @gray; + background-color: @white; + border: 1px solid #ddd; + border-bottom-color: transparent; + cursor: default; +} + +// PILLS +// ----- + +// Links rendered as pills +.nav-pills > li > a { + padding-top: 8px; + padding-bottom: 8px; + margin-top: 2px; + margin-bottom: 2px; + .border-radius(5px); +} + +// Active state +.nav-pills .active > a, +.nav-pills .active > a:hover { + color: @white; + background-color: @linkColor; +} + + + +// STACKED NAV +// ----------- + +// Stacked tabs and pills +.nav-stacked > li { + float: none; +} +.nav-stacked > li > a { + margin-right: 0; // no need for the gap between nav items +} + +// Tabs +.nav-tabs.nav-stacked { + border-bottom: 0; +} +.nav-tabs.nav-stacked > li > a { + border: 1px solid #ddd; + .border-radius(0); +} +.nav-tabs.nav-stacked > li:first-child > a { + .border-radius(4px 4px 0 0); +} +.nav-tabs.nav-stacked > li:last-child > a { + .border-radius(0 0 4px 4px); +} +.nav-tabs.nav-stacked > li > a:hover { + border-color: #ddd; + z-index: 2; +} + +// Pills +.nav-pills.nav-stacked > li > a { + margin-bottom: 3px; +} +.nav-pills.nav-stacked > li:last-child > a { + margin-bottom: 1px; // decrease margin to match sizing of stacked tabs +} + + + +// DROPDOWNS +// --------- + +// Position the menu +.nav-tabs .dropdown-menu, +.nav-pills .dropdown-menu { + margin-top: 1px; + border-width: 1px; +} +.nav-pills .dropdown-menu { + .border-radius(4px); +} + +// Default dropdown links +// ------------------------- +// Make carets use linkColor to start +.nav-tabs .dropdown-toggle .caret, +.nav-pills .dropdown-toggle .caret { + border-top-color: @linkColor; + margin-top: 6px; +} +.nav-tabs .dropdown-toggle:hover .caret, +.nav-pills .dropdown-toggle:hover .caret { + border-top-color: @linkColorHover; +} + +// Active dropdown links +// ------------------------- +.nav-tabs .active .dropdown-toggle .caret, +.nav-pills .active .dropdown-toggle .caret { + border-top-color: @grayDark; +} + +// Active:hover dropdown links +// ------------------------- +.nav > .dropdown.active > a:hover { + color: @black; + cursor: pointer; +} + +// Open dropdowns +// ------------------------- +.nav-tabs .open .dropdown-toggle, +.nav-pills .open .dropdown-toggle, +.nav > .open.active > a:hover { + color: @white; + background-color: @grayLight; + border-color: @grayLight; +} +.nav .open .caret, +.nav .open.active .caret, +.nav .open a:hover .caret { + border-top-color: @white; + .opacity(100); +} + +// Dropdowns in stacked tabs +.tabs-stacked .open > a:hover { + border-color: @grayLight; +} + + + +// TABBABLE +// -------- + + +// COMMON STYLES +// ------------- + +// Clear any floats +.tabbable { + .clearfix(); +} + +// Remove border on bottom, left, right +.tabs-below .nav-tabs, +.tabs-right .nav-tabs, +.tabs-left .nav-tabs { + border-bottom: 0; +} + +// Show/hide tabbable areas +.tab-content > .tab-pane, +.pill-content > .pill-pane { + display: none; +} +.tab-content > .active, +.pill-content > .active { + display: block; +} + + +// BOTTOM +// ------ + +.tabs-below .nav-tabs { + border-top: 1px solid #ddd; +} +.tabs-below .nav-tabs > li { + margin-top: -1px; + margin-bottom: 0; +} +.tabs-below .nav-tabs > li > a { + .border-radius(0 0 4px 4px); + &:hover { + border-bottom-color: transparent; + border-top-color: #ddd; + } +} +.tabs-below .nav-tabs .active > a, +.tabs-below .nav-tabs .active > a:hover { + border-color: transparent #ddd #ddd #ddd; +} + +// LEFT & RIGHT +// ------------ + +// Common styles +.tabs-left .nav-tabs > li, +.tabs-right .nav-tabs > li { + float: none; +} +.tabs-left .nav-tabs > li > a, +.tabs-right .nav-tabs > li > a { + min-width: 74px; + margin-right: 0; + margin-bottom: 3px; +} + +// Tabs on the left +.tabs-left .nav-tabs { + float: left; + margin-right: 19px; + border-right: 1px solid #ddd; +} +.tabs-left .nav-tabs > li > a { + margin-right: -1px; + .border-radius(4px 0 0 4px); +} +.tabs-left .nav-tabs > li > a:hover { + border-color: @grayLighter #ddd @grayLighter @grayLighter; +} +.tabs-left .nav-tabs .active > a, +.tabs-left .nav-tabs .active > a:hover { + border-color: #ddd transparent #ddd #ddd; + *border-right-color: @white; +} + +// Tabs on the right +.tabs-right .nav-tabs { + float: right; + margin-left: 19px; + border-left: 1px solid #ddd; +} +.tabs-right .nav-tabs > li > a { + margin-left: -1px; + .border-radius(0 4px 4px 0); +} +.tabs-right .nav-tabs > li > a:hover { + border-color: @grayLighter @grayLighter @grayLighter #ddd; +} +.tabs-right .nav-tabs .active > a, +.tabs-right .nav-tabs .active > a:hover { + border-color: #ddd #ddd #ddd transparent; + *border-left-color: @white; +} diff -r d0004f5eea59f83543349b161fdb4559d543b07c -r b1dac5a9b1d7d01a9e55940a4546fc5ed6f79bd0 static/june_2007_style/bootstrap/pager.less --- /dev/null +++ b/static/june_2007_style/bootstrap/pager.less @@ -0,0 +1,30 @@ +// PAGER +// ----- + +.pager { + margin-left: 0; + margin-bottom: @baseLineHeight; + list-style: none; + text-align: center; + .clearfix(); +} +.pager li { + display: inline; +} +.pager a { + display: inline-block; + padding: 5px 14px; + background-color: #fff; + border: 1px solid #ddd; + .border-radius(15px); +} +.pager a:hover { + text-decoration: none; + background-color: #f5f5f5; +} +.pager .next a { + float: right; +} +.pager .previous a { + float: left; +} diff -r d0004f5eea59f83543349b161fdb4559d543b07c -r b1dac5a9b1d7d01a9e55940a4546fc5ed6f79bd0 static/june_2007_style/bootstrap/pagination.less --- /dev/null +++ b/static/june_2007_style/bootstrap/pagination.less @@ -0,0 +1,55 @@ +// PAGINATION +// ---------- + +.pagination { + height: @baseLineHeight * 2; + margin: @baseLineHeight 0; + } +.pagination ul { + display: inline-block; + .ie7-inline-block(); + margin-left: 0; + margin-bottom: 0; + .border-radius(3px); + .box-shadow(0 1px 2px rgba(0,0,0,.05)); +} +.pagination li { + display: inline; + } +.pagination a { + float: left; + padding: 0 14px; + line-height: (@baseLineHeight * 2) - 2; + text-decoration: none; + border: 1px solid #ddd; + border-left-width: 0; +} +.pagination a:hover, +.pagination .active a { + background-color: #f5f5f5; +} +.pagination .active a { + color: @grayLight; + cursor: default; +} +.pagination .disabled a, +.pagination .disabled a:hover { + color: @grayLight; + background-color: transparent; + cursor: default; +} +.pagination li:first-child a { + border-left-width: 1px; + .border-radius(3px 0 0 3px); +} +.pagination li:last-child a { + .border-radius(0 3px 3px 0); +} + +// Centered +.pagination-centered { + text-align: center; +} +.pagination-right { + text-align: right; +} diff -r d0004f5eea59f83543349b161fdb4559d543b07c -r b1dac5a9b1d7d01a9e55940a4546fc5ed6f79bd0 static/june_2007_style/bootstrap/popovers.less --- /dev/null +++ b/static/june_2007_style/bootstrap/popovers.less @@ -0,0 +1,49 @@ +// POPOVERS +// -------- + +.popover { + position: absolute; + top: 0; + left: 0; + z-index: @zindexPopover; + display: none; + padding: 5px; + &.top { margin-top: -5px; } + &.right { margin-left: 5px; } + &.bottom { margin-top: 5px; } + &.left { margin-left: -5px; } + &.top .arrow { #popoverArrow > .top(); } + &.right .arrow { #popoverArrow > .right(); } + &.bottom .arrow { #popoverArrow > .bottom(); } + &.left .arrow { #popoverArrow > .left(); } + .arrow { + position: absolute; + width: 0; + height: 0; + } +} +.popover-inner { + padding: 3px; + width: 280px; + overflow: hidden; + background: @black; // has to be full background declaration for IE fallback + background: rgba(0,0,0,.8); + .border-radius(6px); + .box-shadow(0 3px 7px rgba(0,0,0,0.3)); +} +.popover-title { + padding: 9px 15px; + line-height: 1; + background-color: #f5f5f5; + border-bottom:1px solid #eee; + .border-radius(3px 3px 0 0); +} +.popover-content { + padding: 14px; + background-color: @white; + .border-radius(0 0 3px 3px); + .background-clip(padding-box); + p, ul, ol { + margin-bottom: 0; + } +} diff -r d0004f5eea59f83543349b161fdb4559d543b07c -r b1dac5a9b1d7d01a9e55940a4546fc5ed6f79bd0 static/june_2007_style/bootstrap/progress-bars.less --- /dev/null +++ b/static/june_2007_style/bootstrap/progress-bars.less @@ -0,0 +1,95 @@ +// PROGRESS BARS +// ------------- + + +// ANIMATIONS +// ---------- + +// Webkit +@-webkit-keyframes progress-bar-stripes { + from { background-position: 0 0; } + to { background-position: 40px 0; } +} + +// Firefox +@-moz-keyframes progress-bar-stripes { + from { background-position: 0 0; } + to { background-position: 40px 0; } +} + +// Spec +@keyframes progress-bar-stripes { + from { background-position: 0 0; } + to { background-position: 40px 0; } +} + + + +// THE BARS +// -------- + +// Outer container +.progress { + overflow: hidden; + height: 18px; + margin-bottom: 18px; + #gradient > .vertical(#f5f5f5, #f9f9f9); + .box-shadow(inset 0 1px 2px rgba(0,0,0,.1)); + .border-radius(4px); +} + +// Bar of progress +.progress .bar { + width: 0%; + height: 18px; + color: @white; + font-size: 12px; + text-align: center; + text-shadow: 0 -1px 0 rgba(0,0,0,.25); + #gradient > .vertical(#149bdf, #0480be); + .box-shadow(inset 0 -1px 0 rgba(0,0,0,.15)); + .box-sizing(border-box); + .transition(width .6s ease); +} + +// Striped bars +.progress-striped .bar { + #gradient > .striped(#62c462); + .background-size(40px 40px); +} + +// Call animation for the active one +.progress.active .bar { + -webkit-animation: progress-bar-stripes 2s linear infinite; + -moz-animation: progress-bar-stripes 2s linear infinite; + animation: progress-bar-stripes 2s linear infinite; +} + + + +// COLORS +// ------ + +// Danger (red) +.progress-danger .bar { + #gradient > .vertical(#ee5f5b, #c43c35); +} +.progress-danger.progress-striped .bar { + #gradient > .striped(#ee5f5b); +} + +// Success (green) +.progress-success .bar { + #gradient > .vertical(#62c462, #57a957); +} +.progress-success.progress-striped .bar { + #gradient > .striped(#62c462); +} + +// Info (teal) +.progress-info .bar { + #gradient > .vertical(#5bc0de, #339bb9); +} +.progress-info.progress-striped .bar { + #gradient > .striped(#5bc0de); +} diff -r d0004f5eea59f83543349b161fdb4559d543b07c -r b1dac5a9b1d7d01a9e55940a4546fc5ed6f79bd0 static/june_2007_style/bootstrap/reset.less --- /dev/null +++ b/static/june_2007_style/bootstrap/reset.less @@ -0,0 +1,126 @@ +// Reset.less +// Adapted from Normalize.css http://github.com/necolas/normalize.css +// ------------------------------------------------------------------------ + +// Display in IE6-9 and FF3 +// ------------------------- + +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +nav, +section { + display: block; +} + +// Display block in IE6-9 and FF3 +// ------------------------- + +audio, +canvas, +video { + display: inline-block; + *display: inline; + *zoom: 1; +} + +// Prevents modern browsers from displaying 'audio' without controls +// ------------------------- + +audio:not([controls]) { + display: none; +} + +// Base settings +// ------------------------- + +html { + font-size: 100%; + -webkit-text-size-adjust: 100%; + -ms-text-size-adjust: 100%; +} +// Focus states +a:focus { + .tab-focus(); +} +// Hover & Active +a:hover, +a:active { + outline: 0; +} + +// Prevents sub and sup affecting line-height in all browsers +// ------------------------- + +sub, +sup { + position: relative; + font-size: 75%; + line-height: 0; + vertical-align: baseline; +} +sup { + top: -0.5em; +} +sub { + bottom: -0.25em; +} + +// Img border in a's and image quality +// ------------------------- + +img { + max-width: 100%; + height: auto; + border: 0; + -ms-interpolation-mode: bicubic; +} + +// Forms +// ------------------------- + +// Font size in all browsers, margin changes, misc consistency +button, +input, +select, +textarea { + margin: 0; + font-size: 100%; + vertical-align: middle; +} +button, +input { + *overflow: visible; // Inner spacing ie IE6/7 + line-height: normal; // FF3/4 have !important on line-height in UA stylesheet +} +button::-moz-focus-inner, +input::-moz-focus-inner { // Inner padding and border oddities in FF3/4 + padding: 0; + border: 0; +} +button, +input[type="button"], +input[type="reset"], +input[type="submit"] { + cursor: pointer; // Cursors on all buttons applied consistently + -webkit-appearance: button; // Style clicable inputs in iOS +} +input[type="search"] { // Appearance in Safari/Chrome + -webkit-appearance: textfield; + -webkit-box-sizing: content-box; + -moz-box-sizing: content-box; + box-sizing: content-box; +} +input[type="search"]::-webkit-search-decoration, +input[type="search"]::-webkit-search-cancel-button { + -webkit-appearance: none; // Inner-padding issues in Chrome OSX, Safari 5 +} +textarea { + overflow: auto; // Remove vertical scrollbar in IE6-9 + vertical-align: top; // Readability and alignment cross-browser +} diff -r d0004f5eea59f83543349b161fdb4559d543b07c -r b1dac5a9b1d7d01a9e55940a4546fc5ed6f79bd0 static/june_2007_style/bootstrap/responsive.less --- /dev/null +++ b/static/june_2007_style/bootstrap/responsive.less @@ -0,0 +1,323 @@ +/*! + * Bootstrap Responsive v2.0.0 + * + * Copyright 2012 Twitter, Inc + * Licensed under the Apache License v2.0 + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Designed and built with all the love in the world @twitter by @mdo and @fat. + */ + +// Responsive.less +// For phone and tablet devices +// ------------------------------------------------------------- + + +// REPEAT VARIABLES & MIXINS +// ------------------------- +// Required since we compile the responsive stuff separately + +@import "variables.less"; // Modify this for custom colors, font-sizes, etc +@import "mixins.less"; + + +// RESPONSIVE CLASSES +// ------------------ + +// Hide from screenreaders and browsers +// Credit: HTML5 Boilerplate +.hidden { + display: none; + visibility: hidden; +} + + + +// UP TO LANDSCAPE PHONE +// --------------------- + +@media (max-width: 480px) { + + // Smooth out the collapsing/expanding nav + .nav-collapse { + -webkit-transform: translate3d(0, 0, 0); // activate the GPU + } + + // Block level the page header small tag for readability + .page-header h1 small { + display: block; + line-height: @baseLineHeight; + } + + // Make span* classes full width + input[class*="span"], + select[class*="span"], + textarea[class*="span"], + .uneditable-input { + display: block; + width: 100%; + height: 28px; /* Make inputs at least the height of their button counterpart */ + /* Makes inputs behave like true block-level elements */ + -webkit-box-sizing: border-box; /* Older Webkit */ + -moz-box-sizing: border-box; /* Older FF */ + -ms-box-sizing: border-box; /* IE8 */ + box-sizing: border-box; /* CSS3 spec*/ + } + // But don't let it screw up prepend/append inputs + .input-prepend input[class*="span"], + .input-append input[class*="span"] { + width: auto; + } + + // Update checkboxes for iOS + input[type="checkbox"], + input[type="radio"] { + border: 1px solid #ccc; + } + + // Remove the horizontal form styles + .form-horizontal .control-group > label { + float: none; + width: auto; + padding-top: 0; + text-align: left; + } + // Move over all input controls and content + .form-horizontal .controls { + margin-left: 0; + } + // Move the options list down to align with labels + .form-horizontal .control-list { + padding-top: 0; // has to be padding because margin collaspes + } + // Move over buttons in .form-actions to align with .controls + .form-horizontal .form-actions { + padding-left: 10px; + padding-right: 10px; + } + + // Modals + .modal { + position: absolute; + top: 10px; + left: 10px; + right: 10px; + width: auto; + margin: 0; + &.fade.in { top: auto; } + } + .modal-header .close { + padding: 10px; + margin: -10px; + } + + // Carousel + .carousel-caption { + position: static; + } + +} + + + +// LANDSCAPE PHONE TO SMALL DESKTOP & PORTRAIT TABLET +// -------------------------------------------------- + +@media (max-width: 768px) { + // GRID & CONTAINERS + // ----------------- + // Remove width from containers + .container { + width: auto; + padding: 0 20px; + } + // Fluid rows + .row-fluid { + width: 100%; + } + // Undo negative margin on rows + .row { + margin-left: 0; + } + // Make all columns even + .row > [class*="span"], + .row-fluid > [class*="span"] { + float: none; + display: block; + width: auto; + margin: 0; + } +} + + + +// PORTRAIT TABLET TO DEFAULT DESKTOP +// ---------------------------------- + +@media (min-width: 768px) and (max-width: 980px) { + + // Fixed grid + #gridSystem > .generate(12, 42px, 20px); + + // Fluid grid + #fluidGridSystem > .generate(12, 5.801104972%, 2.762430939%); + + // Input grid + #inputGridSystem > .generate(12, 42px, 20px); + +} + + + +// TABLETS AND BELOW +// ----------------- +@media (max-width: 980px) { + + // UNFIX THE TOPBAR + // ---------------- + // Remove any padding from the body + body { + padding-top: 0; + } + // Unfix the navbar + .navbar-fixed-top { + position: static; + margin-bottom: @baseLineHeight; + } + .navbar-fixed-top .navbar-inner { + padding: 5px; + } + .navbar .container { + width: auto; + padding: 0; + } + // Account for brand name + .navbar .brand { + padding-left: 10px; + padding-right: 10px; + margin: 0 0 0 -5px; + } + // Nav collapse clears brand + .navbar .nav-collapse { + clear: left; + } + // Block-level the nav + .navbar .nav { + float: none; + margin: 0 0 (@baseLineHeight / 2); + } + .navbar .nav > li { + float: none; + } + .navbar .nav > li > a { + margin-bottom: 2px; + } + .navbar .nav > .divider-vertical { + display: none; + } + // Nav and dropdown links in navbar + .navbar .nav > li > a, + .navbar .dropdown-menu a { + padding: 6px 15px; + font-weight: bold; + color: @navbarLinkColor; + .border-radius(3px); + } + .navbar .dropdown-menu li + li a { + margin-bottom: 2px; + } + .navbar .nav > li > a:hover, + .navbar .dropdown-menu a:hover { + background-color: @navbarBackground; + } + // Dropdowns in the navbar + .navbar .dropdown-menu { + position: static; + top: auto; + left: auto; + float: none; + display: block; + max-width: none; + margin: 0 15px; + padding: 0; + background-color: transparent; + border: none; + .border-radius(0); + .box-shadow(none); + } + .navbar .dropdown-menu:before, + .navbar .dropdown-menu:after { + display: none; + } + .navbar .dropdown-menu .divider { + display: none; + } + // Forms in navbar + .navbar-form, + .navbar-search { + float: none; + padding: (@baseLineHeight / 2) 15px; + margin: (@baseLineHeight / 2) 0; + border-top: 1px solid @navbarBackground; + border-bottom: 1px solid @navbarBackground; + @shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1); + .box-shadow(@shadow); + } + // Pull right (secondary) nav content + .navbar .nav.pull-right { + float: none; + margin-left: 0; + } + // Static navbar + .navbar-static .navbar-inner { + padding-left: 10px; + padding-right: 10px; + } + // Navbar button + .btn-navbar { + display: block; + } + + // Hide everything in the navbar save .brand and toggle button */ + .nav-collapse { + overflow: hidden; + height: 0; + } +} + + + +// DEFAULT DESKTOP +// --------------- + +@media (min-width: 980px) { + .nav-collapse.collapse { + height: auto !important; + } +} + + + +// LARGE DESKTOP & UP +// ------------------ + +@media (min-width: 1200px) { + + // Fixed grid + #gridSystem > .generate(12, 70px, 30px); + + // Fluid grid + #fluidGridSystem > .generate(12, 5.982905983%, 2.564102564%); + + // Input grid + #inputGridSystem > .generate(12, 70px, 30px); + + // Thumbnails + .thumbnails { + margin-left: -30px; + } + .thumbnails > li { + margin-left: 30px; + } + +} diff -r d0004f5eea59f83543349b161fdb4559d543b07c -r b1dac5a9b1d7d01a9e55940a4546fc5ed6f79bd0 static/june_2007_style/bootstrap/scaffolding.less --- /dev/null +++ b/static/june_2007_style/bootstrap/scaffolding.less @@ -0,0 +1,29 @@ +// Scaffolding +// Basic and global styles for generating a grid system, structural layout, and page templates +// ------------------------------------------------------------------------------------------- + + +// STRUCTURAL LAYOUT +// ----------------- + +body { + margin: 0; + font-family: @baseFontFamily; + font-size: @baseFontSize; + line-height: @baseLineHeight; + color: @textColor; + background-color: @white; +} + + +// LINKS +// ----- + +a { + color: @linkColor; + text-decoration: none; +} +a:hover { + color: @linkColorHover; + text-decoration: underline; +} diff -r d0004f5eea59f83543349b161fdb4559d543b07c -r b1dac5a9b1d7d01a9e55940a4546fc5ed6f79bd0 static/june_2007_style/bootstrap/sprites.less --- /dev/null +++ b/static/june_2007_style/bootstrap/sprites.less @@ -0,0 +1,156 @@ +// SPRITES +// Glyphs and icons for buttons, nav, and more +// ------------------------------------------- + + +// ICONS +// ----- + +// All icons receive the styles of the <i> tag with a base class +// of .i and are then given a unique class to add width, height, +// and background-position. Your resulting HTML will look like +// <i class="i icon-inbox"></i>. + +// For the white version of the icons, just add the .icon-white class: +// <i class="i icon-inbox icon-white"></i> + +[class^="icon-"] { + display: inline-block; + width: 14px; + height: 14px; + vertical-align: text-top; + background-image: url(../img/glyphicons-halflings.png); + background-position: 14px 14px; + background-repeat: no-repeat; + + .ie7-restore-right-whitespace(); +} +.icon-white { + background-image: url(../img/glyphicons-halflings-white.png); +} + +.icon-glass { background-position: 0 0; } +.icon-music { background-position: -24px 0; } +.icon-search { background-position: -48px 0; } +.icon-envelope { background-position: -72px 0; } +.icon-heart { background-position: -96px 0; } +.icon-star { background-position: -120px 0; } +.icon-star-empty { background-position: -144px 0; } +.icon-user { background-position: -168px 0; } +.icon-film { background-position: -192px 0; } +.icon-th-large { background-position: -216px 0; } +.icon-th { background-position: -240px 0; } +.icon-th-list { background-position: -264px 0; } +.icon-ok { background-position: -288px 0; } +.icon-remove { background-position: -312px 0; } +.icon-zoom-in { background-position: -336px 0; } +.icon-zoom-out { background-position: -360px 0; } +.icon-off { background-position: -384px 0; } +.icon-signal { background-position: -408px 0; } +.icon-cog { background-position: -432px 0; } +.icon-trash { background-position: -456px 0; } + +.icon-home { background-position: 0 -24px; } +.icon-file { background-position: -24px -24px; } +.icon-time { background-position: -48px -24px; } +.icon-road { background-position: -72px -24px; } +.icon-download-alt { background-position: -96px -24px; } +.icon-download { background-position: -120px -24px; } +.icon-upload { background-position: -144px -24px; } +.icon-inbox { background-position: -168px -24px; } +.icon-play-circle { background-position: -192px -24px; } +.icon-repeat { background-position: -216px -24px; } +.icon-refresh { background-position: -240px -24px; } +.icon-list-alt { background-position: -264px -24px; } +.icon-lock { background-position: -287px -24px; } // 1px off +.icon-flag { background-position: -312px -24px; } +.icon-headphones { background-position: -336px -24px; } +.icon-volume-off { background-position: -360px -24px; } +.icon-volume-down { background-position: -384px -24px; } +.icon-volume-up { background-position: -408px -24px; } +.icon-qrcode { background-position: -432px -24px; } +.icon-barcode { background-position: -456px -24px; } + +.icon-tag { background-position: 0 -48px; } +.icon-tags { background-position: -25px -48px; } // 1px off +.icon-book { background-position: -48px -48px; } +.icon-bookmark { background-position: -72px -48px; } +.icon-print { background-position: -96px -48px; } +.icon-camera { background-position: -120px -48px; } +.icon-font { background-position: -144px -48px; } +.icon-bold { background-position: -167px -48px; } // 1px off +.icon-italic { background-position: -192px -48px; } +.icon-text-height { background-position: -216px -48px; } +.icon-text-width { background-position: -240px -48px; } +.icon-align-left { background-position: -264px -48px; } +.icon-align-center { background-position: -288px -48px; } +.icon-align-right { background-position: -312px -48px; } +.icon-align-justify { background-position: -336px -48px; } +.icon-list { background-position: -360px -48px; } +.icon-indent-left { background-position: -384px -48px; } +.icon-indent-right { background-position: -408px -48px; } +.icon-facetime-video { background-position: -432px -48px; } +.icon-picture { background-position: -456px -48px; } + +.icon-pencil { background-position: 0 -72px; } +.icon-map-marker { background-position: -24px -72px; } +.icon-adjust { background-position: -48px -72px; } +.icon-tint { background-position: -72px -72px; } +.icon-edit { background-position: -96px -72px; } +.icon-share { background-position: -120px -72px; } +.icon-check { background-position: -144px -72px; } +.icon-move { background-position: -168px -72px; } +.icon-step-backward { background-position: -192px -72px; } +.icon-fast-backward { background-position: -216px -72px; } +.icon-backward { background-position: -240px -72px; } +.icon-play { background-position: -264px -72px; } +.icon-pause { background-position: -288px -72px; } +.icon-stop { background-position: -312px -72px; } +.icon-forward { background-position: -336px -72px; } +.icon-fast-forward { background-position: -360px -72px; } +.icon-step-forward { background-position: -384px -72px; } +.icon-eject { background-position: -408px -72px; } +.icon-chevron-left { background-position: -432px -72px; } +.icon-chevron-right { background-position: -456px -72px; } + +.icon-plus-sign { background-position: 0 -96px; } +.icon-minus-sign { background-position: -24px -96px; } +.icon-remove-sign { background-position: -48px -96px; } +.icon-ok-sign { background-position: -72px -96px; } +.icon-question-sign { background-position: -96px -96px; } +.icon-info-sign { background-position: -120px -96px; } +.icon-screenshot { background-position: -144px -96px; } +.icon-remove-circle { background-position: -168px -96px; } +.icon-ok-circle { background-position: -192px -96px; } +.icon-ban-circle { background-position: -216px -96px; } +.icon-arrow-left { background-position: -240px -96px; } +.icon-arrow-right { background-position: -264px -96px; } +.icon-arrow-up { background-position: -289px -96px; } // 1px off +.icon-arrow-down { background-position: -312px -96px; } +.icon-share-alt { background-position: -336px -96px; } +.icon-resize-full { background-position: -360px -96px; } +.icon-resize-small { background-position: -384px -96px; } +.icon-plus { background-position: -408px -96px; } +.icon-minus { background-position: -433px -96px; } +.icon-asterisk { background-position: -456px -96px; } + +.icon-exclamation-sign { background-position: 0 -120px; } +.icon-gift { background-position: -24px -120px; } +.icon-leaf { background-position: -48px -120px; } +.icon-fire { background-position: -72px -120px; } +.icon-eye-open { background-position: -96px -120px; } +.icon-eye-close { background-position: -120px -120px; } +.icon-warning-sign { background-position: -144px -120px; } +.icon-plane { background-position: -168px -120px; } +.icon-calendar { background-position: -192px -120px; } +.icon-random { background-position: -216px -120px; } +.icon-comment { background-position: -240px -120px; } +.icon-magnet { background-position: -264px -120px; } +.icon-chevron-up { background-position: -288px -120px; } +.icon-chevron-down { background-position: -313px -119px; } // 1px off +.icon-retweet { background-position: -336px -120px; } +.icon-shopping-cart { background-position: -360px -120px; } +.icon-folder-close { background-position: -384px -120px; } +.icon-folder-open { background-position: -408px -120px; } +.icon-resize-vertical { background-position: -432px -119px; } +.icon-resize-horizontal { background-position: -456px -118px; } diff -r d0004f5eea59f83543349b161fdb4559d543b07c -r b1dac5a9b1d7d01a9e55940a4546fc5ed6f79bd0 static/june_2007_style/bootstrap/tables.less --- /dev/null +++ b/static/june_2007_style/bootstrap/tables.less @@ -0,0 +1,139 @@ +// +// Tables.less +// Tables for, you guessed it, tabular data +// ---------------------------------------- + + +// BASE TABLES +// ----------------- + +table { + max-width: 100%; + border-collapse: collapse; + border-spacing: 0; +} + +// BASELINE STYLES +// --------------- + +.table { + width: 100%; + margin-bottom: @baseLineHeight; + // Cells + th, + td { + padding: 8px; + line-height: @baseLineHeight; + text-align: left; + border-top: 1px solid #ddd; + } + th { + font-weight: bold; + vertical-align: bottom; + } + td { + vertical-align: top; + } + // Remove top border from thead by default + thead:first-child tr th, + thead:first-child tr td { + border-top: 0; + } + // Account for multiple tbody instances + tbody + tbody { + border-top: 2px solid #ddd; + } +} + + + +// CONDENSED TABLE W/ HALF PADDING +// ------------------------------- + +.table-condensed { + th, + td { + padding: 4px 5px; + } +} + + +// BORDERED VERSION +// ---------------- + +.table-bordered { + border: 1px solid #ddd; + border-collapse: separate; // Done so we can round those corners! + *border-collapse: collapsed; // IE7 can't round corners anyway + .border-radius(4px); + th + th, + td + td, + th + td, + td + th { + border-left: 1px solid #ddd; + } + // Prevent a double border + thead:first-child tr:first-child th, + tbody:first-child tr:first-child th, + tbody:first-child tr:first-child td { + border-top: 0; + } + // For first th or td in the first row in the first thead or tbody + thead:first-child tr:first-child th:first-child, + tbody:first-child tr:first-child td:first-child { + .border-radius(4px 0 0 0); + } + thead:first-child tr:first-child th:last-child, + tbody:first-child tr:first-child td:last-child { + .border-radius(0 4px 0 0); + } + // For first th or td in the first row in the first thead or tbody + thead:last-child tr:last-child th:first-child, + tbody:last-child tr:last-child td:first-child { + .border-radius(0 0 0 4px); + } + thead:last-child tr:last-child th:last-child, + tbody:last-child tr:last-child td:last-child { + .border-radius(0 0 4px 0); + } +} + + +// ZEBRA-STRIPING +// -------------- + +// Default zebra-stripe styles (alternating gray and transparent backgrounds) +.table-striped { + tbody { + tr:nth-child(odd) td, + tr:nth-child(odd) th { + background-color: #f9f9f9; + } + } +} + + + +// TABLE CELL SIZING +// ----------------- + +// Change the columns +.tableColumns(@columnSpan: 1) { + float: none; + width: ((@gridColumnWidth) * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) - 16; + margin-left: 0; +} +table { + .span1 { .tableColumns(1); } + .span2 { .tableColumns(2); } + .span3 { .tableColumns(3); } + .span4 { .tableColumns(4); } + .span5 { .tableColumns(5); } + .span6 { .tableColumns(6); } + .span7 { .tableColumns(7); } + .span8 { .tableColumns(8); } + .span9 { .tableColumns(9); } + .span10 { .tableColumns(10); } + .span11 { .tableColumns(11); } + .span12 { .tableColumns(12); } +} diff -r d0004f5eea59f83543349b161fdb4559d543b07c -r b1dac5a9b1d7d01a9e55940a4546fc5ed6f79bd0 static/june_2007_style/bootstrap/thumbnails.less --- /dev/null +++ b/static/june_2007_style/bootstrap/thumbnails.less @@ -0,0 +1,35 @@ +// THUMBNAILS +// ---------- + +.thumbnails { + margin-left: -20px; + list-style: none; + .clearfix(); +} +.thumbnails > li { + float: left; + margin: 0 0 @baseLineHeight 20px; +} +.thumbnail { + display: block; + padding: 4px; + line-height: 1; + border: 1px solid #ddd; + .border-radius(4px); + .box-shadow(0 1px 1px rgba(0,0,0,.075)); +} +// Add a hover state for linked versions only +a.thumbnail:hover { + border-color: @linkColor; + .box-shadow(0 1px 4px rgba(0,105,214,.25)); +} +// Images and captions +.thumbnail > img { + display: block; + max-width: 100%; + margin-left: auto; + margin-right: auto; +} +.thumbnail .caption { + padding: 9px; +} diff -r d0004f5eea59f83543349b161fdb4559d543b07c -r b1dac5a9b1d7d01a9e55940a4546fc5ed6f79bd0 static/june_2007_style/bootstrap/tooltip.less --- /dev/null +++ b/static/june_2007_style/bootstrap/tooltip.less @@ -0,0 +1,35 @@ +// TOOLTIP +// ------= + +.tooltip { + position: absolute; + z-index: @zindexTooltip; + display: block; + visibility: visible; + padding: 5px; + font-size: 11px; + .opacity(0); + &.in { .opacity(80); } + &.top { margin-top: -2px; } + &.right { margin-left: 2px; } + &.bottom { margin-top: 2px; } + &.left { margin-left: -2px; } + &.top .tooltip-arrow { #popoverArrow > .top(); } + &.left .tooltip-arrow { #popoverArrow > .left(); } + &.bottom .tooltip-arrow { #popoverArrow > .bottom(); } + &.right .tooltip-arrow { #popoverArrow > .right(); } +} +.tooltip-inner { + max-width: 200px; + padding: 3px 8px; + color: @white; + text-align: center; + text-decoration: none; + background-color: @black; + .border-radius(4px); +} +.tooltip-arrow { + position: absolute; + width: 0; + height: 0; +} diff -r d0004f5eea59f83543349b161fdb4559d543b07c -r b1dac5a9b1d7d01a9e55940a4546fc5ed6f79bd0 static/june_2007_style/bootstrap/type.less --- /dev/null +++ b/static/june_2007_style/bootstrap/type.less @@ -0,0 +1,217 @@ +// Typography.less +// Headings, body text, lists, code, and more for a versatile and durable typography system +// ---------------------------------------------------------------------------------------- + + +// BODY TEXT +// --------- + +p { + margin: 0 0 @baseLineHeight / 2; + font-family: @baseFontFamily; + font-size: @baseFontSize; + line-height: @baseLineHeight; + small { + font-size: @baseFontSize - 2; + color: @grayLight; + } +} +.lead { + margin-bottom: @baseLineHeight; + font-size: 20px; + font-weight: 200; + line-height: @baseLineHeight * 1.5; +} + +// HEADINGS +// -------- + +h1, h2, h3, h4, h5, h6 { + margin: 0; + font-weight: bold; + color: @grayDark; + text-rendering: optimizelegibility; // Fix the character spacing for headings + small { + font-weight: normal; + color: @grayLight; + } +} +h1 { + font-size: 30px; + line-height: @baseLineHeight * 2; + small { + font-size: 18px; + } +} +h2 { + font-size: 24px; + line-height: @baseLineHeight * 2; + small { + font-size: 18px; + } +} +h3 { + line-height: @baseLineHeight * 1.5; + font-size: 18px; + small { + font-size: 14px; + } +} +h4, h5, h6 { + line-height: @baseLineHeight; +} +h4 { + font-size: 14px; + small { + font-size: 12px; + } +} +h5 { + font-size: 12px; +} +h6 { + font-size: 11px; + color: @grayLight; + text-transform: uppercase; +} + +// Page header +.page-header { + padding-bottom: @baseLineHeight - 1; + margin: @baseLineHeight 0; + border-bottom: 1px solid @grayLighter; +} +.page-header h1 { + line-height: 1; +} + + + +// LISTS +// ----- + +// Unordered and Ordered lists +ul, ol { + padding: 0; + margin: 0 0 @baseLineHeight / 2 25px; +} +ul ul, +ul ol, +ol ol, +ol ul { + margin-bottom: 0; +} +ul { + list-style: disc; +} +ol { + list-style: decimal; +} +li { + line-height: @baseLineHeight; +} +ul.unstyled { + margin-left: 0; + list-style: none; +} + +// Description Lists +dl { + margin-bottom: @baseLineHeight; +} +dt, +dd { + line-height: @baseLineHeight; +} +dt { + font-weight: bold; +} +dd { + margin-left: @baseLineHeight / 2; +} + +// MISC +// ---- + +// Horizontal rules +hr { + margin: @baseLineHeight 0; + border: 0; + border-top: 1px solid #e5e5e5; + border-bottom: 1px solid @white; +} + +// Emphasis +strong { + font-weight: bold; +} +em { + font-style: italic; +} +.muted { + color: @grayLight; +} + +// Abbreviations and acronyms +abbr { + font-size: 90%; + text-transform: uppercase; + border-bottom: 1px dotted #ddd; + cursor: help; +} + +// Blockquotes +blockquote { + padding: 0 0 0 15px; + margin: 0 0 @baseLineHeight; + border-left: 5px solid @grayLighter; + p { + margin-bottom: 0; + #font > .shorthand(16px,300,@baseLineHeight * 1.25); + } + small { + display: block; + line-height: @baseLineHeight; + color: @grayLight; + &:before { + content: '\2014 \00A0'; + } + } + + // Float right with text-align: right + &.pull-right { + float: right; + padding-left: 0; + padding-right: 15px; + border-left: 0; + border-right: 5px solid @grayLighter; + p, + small { + text-align: right; + } + } +} + +// Quotes +q:before, +q:after, +blockquote:before, +blockquote:after { + content: ""; +} + +// Addresses +address { + display: block; + margin-bottom: @baseLineHeight; + line-height: @baseLineHeight; + font-style: normal; +} + +// Misc +small { + font-size: 100%; +} +cite { + font-style: normal; +} diff -r d0004f5eea59f83543349b161fdb4559d543b07c -r b1dac5a9b1d7d01a9e55940a4546fc5ed6f79bd0 static/june_2007_style/bootstrap/utilities.less --- /dev/null +++ b/static/june_2007_style/bootstrap/utilities.less @@ -0,0 +1,23 @@ +// UTILITY CLASSES +// --------------- + +// Quick floats +.pull-right { + float: right; +} +.pull-left { + float: left; +} + +// Toggling content +.hide { + display: none; +} +.show { + display: block; +} + +// Visibility +.invisible { + visibility: hidden; +} diff -r d0004f5eea59f83543349b161fdb4559d543b07c -r b1dac5a9b1d7d01a9e55940a4546fc5ed6f79bd0 static/june_2007_style/bootstrap/variables.less --- /dev/null +++ b/static/june_2007_style/bootstrap/variables.less @@ -0,0 +1,99 @@ +// Variables.less +// Variables to customize the look and feel of Bootstrap +// ----------------------------------------------------- + + + +// GLOBAL VALUES +// -------------------------------------------------- + +// Links +@linkColor: #08c; +@linkColorHover: darken(@linkColor, 15%); + +// Grays +@black: #000; +@grayDarker: #222; +@grayDark: #333; +@gray: #555; +@grayLight: #999; +@grayLighter: #eee; +@white: #fff; + +// Accent colors +@blue: #049cdb; +@blueDark: #0064cd; +@green: #46a546; +@red: #9d261d; +@yellow: #ffc40d; +@orange: #f89406; +@pink: #c3325f; +@purple: #7a43b6; + +// Typography +@baseFontSize: 13px; +@baseFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif; +@baseLineHeight: 18px; +@textColor: @grayDark; + +// Buttons +@primaryButtonBackground: @linkColor; + + + +// COMPONENT VARIABLES +// -------------------------------------------------- + +// Z-index master list +// Used for a bird's eye view of components dependent on the z-axis +// Try to avoid customizing these :) +@zindexDropdown: 1000; +@zindexPopover: 1010; +@zindexTooltip: 1020; +@zindexFixedNavbar: 1030; +@zindexModalBackdrop: 1040; +@zindexModal: 1050; + +// Input placeholder text color +@placeholderText: @grayLight; + +// Navbar +@navbarHeight: 40px; +@navbarBackground: @grayDarker; +@navbarBackgroundHighlight: @grayDark; + +@navbarText: @grayLight; +@navbarLinkColor: @grayLight; +@navbarLinkColorHover: @white; + +// Form states and alerts +@warningText: #c09853; +@warningBackground: #fcf8e3; +@warningBorder: darken(spin(@warningBackground, -10), 3%); + +@errorText: #b94a48; +@errorBackground: #f2dede; +@errorBorder: darken(spin(@errorBackground, -10), 3%); + +@successText: #468847; +@successBackground: #dff0d8; +@successBorder: darken(spin(@successBackground, -10), 5%); + +@infoText: #3a87ad; +@infoBackground: #d9edf7; +@infoBorder: darken(spin(@infoBackground, -10), 7%); + + + +// GRID +// -------------------------------------------------- + +// Default 940px grid +@gridColumns: 12; +@gridColumnWidth: 60px; +@gridGutterWidth: 20px; +@gridRowWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1)); + +// Fluid grid +@fluidGridColumnWidth: 6.382978723%; +@fluidGridGutterWidth: 2.127659574%; diff -r d0004f5eea59f83543349b161fdb4559d543b07c -r b1dac5a9b1d7d01a9e55940a4546fc5ed6f79bd0 static/june_2007_style/bootstrap/wells.less --- /dev/null +++ b/static/june_2007_style/bootstrap/wells.less @@ -0,0 +1,17 @@ +// WELLS +// ----- + +.well { + min-height: 20px; + padding: 19px; + margin-bottom: 20px; + background-color: #f5f5f5; + border: 1px solid #eee; + border: 1px solid rgba(0,0,0,.05); + .border-radius(4px); + .box-shadow(inset 0 1px 1px rgba(0,0,0,.05)); + blockquote { + border-color: #ddd; + border-color: rgba(0,0,0,.15); + } +} https://bitbucket.org/galaxy/galaxy-central/changeset/fca74f956202/ changeset: fca74f956202 user: james_taylor date: 2012-02-14 17:43:41 summary: style: move base and panel_layout over to less, experimenting with bootstrap mixins. affected #: 12 files diff -r b1dac5a9b1d7d01a9e55940a4546fc5ed6f79bd0 -r fca74f9562024605dd87a3a6ace02d28a1851f5e static/june_2007_style/Makefile --- a/static/june_2007_style/Makefile +++ b/static/june_2007_style/Makefile @@ -15,7 +15,7 @@ # Convert using less %.css : %.less - lessc -x --include-path=$(OUT) $< > $@ + lessc -x $< $@ # Old style using process_css still works so we can move gradually %.css : %.css.tmpl diff -r b1dac5a9b1d7d01a9e55940a4546fc5ed6f79bd0 -r fca74f9562024605dd87a3a6ace02d28a1851f5e static/june_2007_style/base.css.tmpl --- a/static/june_2007_style/base.css.tmpl +++ /dev/null @@ -1,979 +0,0 @@ -## Lucida Grande for proper mac unicode characters, verdana/arial stack for others -body{font:13px/1.231 "Lucida Grande",verdana,arial,helvetica,sans-serif;*font-size:small;*font:x-small;}select,input,button,textarea,button{font:99% "Lucida Grande",verdana,arial,helvetica,sans-serif;}table{font-size:inherit;font:100%;}pre,code,kbd,samp,tt{font-family:monospace;*font-size:108%;line-height:100%;} -body{font-size:75%;} - -## Mixins - -.unselectable { - user-select: none; - -moz-user-select: none; - -webkit-user-select: none; -} - -.shadow { - -moz-box-shadow: 0 3px 30px black; - -webkit-box-shadow: 0 3px 30px black; -} - -## Real styles - -body { - background: $base_bg_bottom; - color: $base_text; - background-image: url(base_bg.png); - background-repeat: repeat-x; - background-position: top; - margin: 10px; -} - -img { - border: 0; -} - - -a:link, a:visited, a:active { - color: $link_text; -} - -h1, h2, h3, h4 { - color: $header_text; - /*text-shadow: #bbb 2px 2px 1px;*/ -} - -h1:first-child, h2:first-child, h3:first-child, h4:first-child { - margin-top: 0px; -} - -hr { - border: none; - height: 0px; - border-bottom: dotted $base_text 1px; -} - -table { - border-collapse: collapse; -} - -th { - text-align: left; -} - -div.toolForm { - border: solid $form_border 1px; -} - -div.toolFormTitle { - font-weight: bold; - padding: 5px; - padding-left: 10px; - padding-right: 10px; - background: $form_title_bg_bottom; - ## background-image: url(form_title_bg.png); - background-repeat: repeat-x; - background-position: top; - border-bottom: solid $form_border 1px; -} - -div.toolParamHelp { - color: #666; -} - -div.toolParamHelp a { - color: #666; -} - -div.toolFormBody { - background: $form_body_bg_bottom; - background-image: url(form_body_bg.png); - background-repeat: repeat-x; - background-position: top; - padding: 5px 0; -} - -div.toolFormBody div.toolFormTitle { - background: transparent; - border: none; - font-weight: bold; - border-bottom: solid $form_border 1px; - margin-bottom: 5px; -} - -div.toolFormDisabled div.toolFormTitle { - background: ${layout_bg}; - border-color: ${layout_border}; -} - -div.toolFormDisabled { - border-color: ${layout_border}; -} - -div.toolHelp { - margin-top: 10px; -} - -div.toolHelpBody { - width: 100%; -} - -div.metadataForm { - border:solid #aaaaaa 1px; -} - -div.metadataFormTitle { - font-weight:bold; - padding:5px; - padding-left:10px; - padding-right:10px; - background:#cccccc; - background-repeat:repeat-x; - background-position:top; - border-bottom:solid #aaaaaa 1px; -} - -div.metadataFormBody { - background:#FFFFFF; - background-image:url(form_body_bg.png); - background-repeat:repeat-x; - background-position:top; - padding:5px 0; -} - -div.metadataFormBody div.metadataFormTitle { - background:transparent; - border:none; - font-weight:bold; - border-bottom:solid #dcb790 1px; - margin-bottom:5px; -} - -div.metadataFormDisabled div.metadataFormTitle { - background:#eee; - border-color:#999; -} - -div.metadataFormDisabled { - border-color:#999; -} - -div.metadataHelpBody { - width:100%;overflow:auto; -} - -div.titleRow { - font-weight: bold; - border-bottom: dotted gray 1px; - margin-bottom: 0.5em; - padding-bottom: 0.25em; -} - -## Forms - -div.form { - border: solid $form_border 1px; -} - -div.form-title { - font-weight: bold; - padding: 5px 10px; - background: $form_title_bg_bottom; - background-image: url(form_title_bg.png); - background-repeat: repeat-x; - background-position: top; - border-bottom: solid $form_border 1px; -} - -div.form-body { - padding: 5px 0; -} - -div.form-row { - padding: 5px 10px; -} - -div.form-title-row { - padding: 5px 10px; -} - -div.repeat-group-item { - border-left: solid $form_border 5px; - margin-left: 10px; - margin-bottom: 10px; -} - -div.form-row-error { - background: $error_message_bg; -} - -div.form-row label { - font-weight: bold; - display: block; - margin-bottom: .2em; -} - -div.form-row label.inline { - display: inline; -} - -div.form-row-input { - float: left; -} - -div.form-row-input label { - font-weight: normal; - display: inline; -} - -div.form-row-error-message { - width: 300px; - float: left; - color: red; - font-weight: bold; - padding: 3px 0 0 1em; -} - -.form-row .help { - color: #666; -} - -select, input, textarea { - font: inherit; -} - -select, textarea, input[type="text"], input[type="file"], input[type="password"] { - -webkit-box-sizing: border-box; - max-width: 300px; -} - -## Messages - -.errormessagelarge, .warningmessagelarge, .donemessagelarge, .infomessagelarge { - padding: 10px; - padding-left: 52px; - min-height: 32px; - border: 1px solid $error_message_border; - background-color: $error_message_bg; - background-image: url(error_message_icon.png); - background-repeat: no-repeat; - background-position: 10px 10px; -} - -.warningmessagelarge { - background-image: url(warn_message_icon.png); - border-color: $warn_message_border; - background-color: $warn_message_bg; -} - -.donemessagelarge { - background-image: url(done_message_icon.png); - border-color: $done_message_border; - background-color: $done_message_bg; -} - -.infomessagelarge { - background-image: url(info_message_icon.png); - border-color: $info_message_border; - background-color: $info_message_bg; -} - -.screencastBox { - padding-left: 10px; - border-color: #AAAA66; - background-color: #FFFFCC; - background-image: none; -} - -.errormessage, .warningmessage, .donemessage, .infomessage, .errormessagesmall, .warningmessagesmall, .donemessagesmall, .infomessagesmall { - padding: 5px; - padding-left: 25px; - min-height: 15px; - border: 1px solid $error_message_border; - background-color: $error_message_bg; - background-image: url(error_small.png); - background-repeat: no-repeat; - background-position: 5px 5px; -} - -.warningmessage, .warningmessagesmall { - background-image: url(warn_small.png); - border-color: $warn_message_border; - background-color: $warn_message_bg; -} - -.donemessage, .donemessagesmall { - background-image: url(ok_small.png); - border-color: $done_message_border; - background-color: $done_message_bg; -} - -.infomessage, .infomessagesmall { - background-image: url(info_small.png); - border-color: $info_message_border; - background-color: $info_message_bg; -} - -.errormark, .warningmark, .donemark, .infomark, .ok_bgr, .err_bgr { - padding-left: 20px; - min-height: 15px; - background: url(error_small.png) no-repeat; -} - -.warningmark { - background-image: url(warn_small.png); -} - -.donemark { - background-image: url(ok_small.png); -} - -.infomark, .ok_bgr { - background-image: url(info_small.png); -} - -table.simple { - font-size: 12px; - background: #fff; - margin: 1em; - border-collapse: collapse; - text-align: left; -} -table.simple th { - font-size: 14px; - font-weight: normal; - padding: 10px 8px; - border-bottom: 2px solid #333; -} -table.simple td { - padding: 10px 8px 0px 8px; -} -table.simple tbody tr:hover td { - color: #333; -} - -table.tabletip { - width: 100%; - border-collapse: collapse; - text-align: left; -} -table.tabletip th { - white-space: nowrap; - border-bottom: 1px solid #444; - padding-right: 3px; -} -table.tabletip td { - border-bottom: 1px solid #ddd; -} -table.tabletip tbody tr:hover td { - background-color: #eee; -} - -table.colored { - border-top: solid $table_border 1px; - border-bottom: solid $table_border 1px; -} - -table.colored td, table.colored th { - text-align: left; - padding: 5px; -} - -table.colored tr.header { - background: $table_header_bg; - background-image: url(form_title_bg.png); - background-repeat: repeat-x; - background-position: top; - border-bottom: solid $table_border 1px; - font-weight: bold; -} - -table.colored tr { - background: $table_row_bg; -} - -table.colored tr.odd_row { - background: $odd_row_bg; -} - -div.debug { - margin: 10px; - padding: 5px; - background: #FFFF99; - border: solid #FFFF33 1px; - color: black; -} - -div.odd_row { - background: $odd_row_bg; -} - -#footer { - display: none; -} - -## Tool panel stuff - -td.panel-body { - background: white; - color: $base_text; - background: $menu_bg_over url(menu_bg.png) top repeat-x; -} - -div.toolSectionPad { - margin: 0; - padding: 0; - height: 5px; - font-size: 0px; -} - -div.toolSectionDetailsInner { - margin-left: 5px; - margin-right: 5px; -} - -div.toolSectionTitle { - padding-bottom: 0px; - font-weight: bold; -} - -div.toolTitle { - padding-top: 5px; - padding-bottom: 5px; - margin-left: 16px; - margin-right: 10px; - display: list-item; - list-style: square outside; -} - -span.toolParameterExpandableCollapsable { - font-weight: bold; - cursor: pointer; -} -ul.toolParameterExpandableCollapsable { - list-style: none; -} - -ul.manage-table-actions { - float: right; - margin-top: -2.5em; -} -ul.manage-table-actions li { - display: block; - float: left; - margin-left: 0.5em; -} - -## State colors - -.state-color-new { - border-color: $history_new_border; - background: $history_new_bg; -} - -.state-color-upload { - border-color: $history_upload_border; - background: $history_upload_bg; -} - -.state-color-waiting { - border-color: $history_waiting_border; - background: $history_waiting_bg; -} - -.state-color-queued { - border-color: $history_queued_border; - background: $history_queued_bg; -} - -.state-color-running { - border-color: $history_running_border; - background: $history_running_bg; -} - -.state-color-ok { - border-color: $history_ok_border; - background: $history_ok_bg; -} - -.state-color-error { - border-color: $history_error_border; - background: $history_error_bg; -} - -.state-color-deleted { - border-color: $history_deleted_border; - background: $history_deleted_bg; -} - -.state-fg-new { - color: #FFB030; -} - -.state-fg-upload { - color: #D090D0; -} - -.state-fg-waiting { - color: #E8C060; -} - -.state-fg-queued { - color: #888888; -} - -.state-fg-running { - color: #AAAA66; -} - -.state-fg-ok { - color: #66AA66; -} - -.state-fg-error { - color: #AA6666; -} - -.state-fg-deleted { - color: #3399FF; -} - -## Button styles - -.action-button { - background: transparent; - line-height: 16px; - color: #333; - text-decoration: none; - font-size: 100%; - font-weight: bold; - display: inline-block; - cursor: pointer; - padding: 2px; - border: solid #aaaaaa 1px; - padding-right: 0.5em; - padding-left: 0.5em; - -moz-border-radius: 0.5em; - -webkit-border-radius: 0.5em; - border-radius: 0.5em; - user-select: none; - -moz-user-select: none; - -webkit-user-select: none; -} - -.action-button > * { - vertical-align: middle; -} - -.action-button:hover { - color: black; - background: #dddddd; -} -.action-button:active { - color: white; - background: #aaaaaa; -} - -## A menu button is a button that has an attached popup menu - -.menubutton { - display: inline-block; - cursor: pointer; - position: relative; - .unselectable; - - border: solid transparent 1px; - -moz-border-radius: 0.25em; - -webkit-border-radius: 0.25em; - border-radius: 0.25em; - - padding: 1px 0.25em; - margin: -1px -0.25em; - - .label { - position: relative; - display: block; - border-right: none; - } -} - -.menubutton.action-button { - border-color: #aaaaaa; -} - -.menubutton.popup, .action-button.popup { - padding-right: 20px; - background-image: url(../images/dropdownarrow.png); - background-repeat: no-repeat; - background-position: right 7px; -} - -.menubutton:hover { - border-color: #aaaaaa; - ## background: #eeeeee; - ## color: #333; -} - -## A split menu button, the main button has an action, the arrow causes the -## popup menu to appear - -.menubutton.popup.split { - padding-right: 2em; -} - -.menubutton.popup.split:hover { - background: url(../images/ddarrowsplit.png) no-repeat right -39px; -} - -## Popup menu styles - -.overlay-border { - position: absolute; - top: 0; - left: 0; - height: 100%; - width: 100%; - padding: 1em; - margin: -1em; - background-color: rgba(0,0,0,0.5); - -moz-border-radius: 1em; - -webkit-border-radius: 1em; - z-index: -1; -} - -div.popmenu-wrapper { - - position: absolute; - top: 100%; - z-index: 20000; - - ul { - - display: block; - margin: 0; - padding: 0; - - background: white; - color: #333; - font-weight: bold; - font-style: normal; - white-space: nowrap; - border: solid #aaaaaa 1px; - padding: 3px 0; - -moz-border-radius: 0.5em; - -webkit-border-radius: 0.5em; - border-radius: 0.5em; - ## margin: -3px -0.5em; - ## min-width: 100%; - - .unselectable; - - li { - display: block; - padding: 3px 1em; - cursor: pointer; - border-top: solid transparent 1px; - border-bottom: solid transparent 1px; - } - - li.head { - color: #999; - font-style: italic; - } - } -} - -div.popmenu-wrapper ul li:hover { - background: #EEEEFF; - border-color: #aaa; -} - -div.popmenu-wrapper ul li.head:hover { - background: inherit; - border-color: transparent; -} - -.popup-arrow { - cursor: pointer; - text-decoration: none; - color: #555; -} - -.popup-arrow:hover { - color: black; -} - -div.permissionContainer { - padding-left: 20px; -} - -## Data grid style - -.grid-header { - padding-bottom: 1em; -} - -.grid-header h2 { - margin: 0; - margin-bottom: 0.5em; -} - -.grid-header .title { - font-weight: bold; -} - -.grid { - padding-top: 1em; - border-collapse: collapse; - width: 100%; -} -.grid tbody td { - border-top: solid #DDDDDD 1px; - border-bottom: solid #DDDDDD 1px; - padding: 0.3em 0.5em; -} -.grid tbody td:empty { - padding: 0; -} -.grid thead tr { - height: 2em; -} -.grid thead th { - background: $table_header_bg; - ## background-image: url(form_title_bg.png); - background-repeat: repeat-x; - background-position: top; - border-top: solid $table_border 1px; - border-bottom: solid $table_border 1px; - padding: 0.3em 0.5em; - text-align: left; - white-space: nowrap; -} -.grid tfoot td { - background-color: #F8F8F8; - border-top: solid #DDDDDD 1px; - border-bottom: solid #DDDDDD 1px; - padding: 0.3em 0.5em; -} -.grid .current { - background-color: #EEEEFF; -} - -## Styles for areas of text content - -.text-content { - - hr { - display:block; - background:black; - color:black; - width:100%; - height:1px; - border:none; - background:#aaa; - color:#aaa; - } - - table - { - border-collapse:collapse; - border-top:1px solid #ccc; - border-left:1px solid #ccc; - } - - blockquote { - color:#666; - } - - fieldset { - border-color:#ccc; - border:1px solid #ccc; - } - - th,td { - border-bottom:1px solid #ddd; - border-right:1px solid #ccc; - } - - th,td { - padding:.8em; - } - -} - -## Icon buttons. - -.icon-button { - width: 16px; - height: 16px; - display: block; - float: left; - margin-left: 2px; - ## Allow alt text for screen readers - text-indent: 20px; - background-repeat:no-repeat; - background-position: 0px 0px; - padding: 0; -} - -.icon-button.display { - -sprite-group: history-buttons; - -sprite-image: eye_icon.png; -} -.icon-button.display:hover { - -sprite-group: history-buttons; - -sprite-image: eye_icon_dark.png; -} -.icon-button.display_disabled { - -sprite-group: history-buttons; - -sprite-image: eye_icon_grey.png; -} -.icon-button.delete { - -sprite-group: history-buttons; - -sprite-image: delete_icon.png; -} -.icon-button.delete:hover { - -sprite-group: history-buttons; - -sprite-image: delete_icon_dark.png; -} -.icon-button.delete_disabled { - -sprite-group: history-buttons; - -sprite-image: delete_icon_grey.png; -} -.icon-button.edit { - -sprite-group: history-buttons; - -sprite-image: pencil_icon.png; -} -.icon-button.edit:hover { - -sprite-group: history-buttons; - -sprite-image: pencil_icon_dark.png; -} -.icon-button.edit_disabled { - -sprite-group: history-buttons; - -sprite-image: pencil_icon_grey.png; -} -.icon-button.tag { - -sprite-group: fugue; - -sprite-image: fugue/tag-label.png; -} -.icon-button.tags { - -sprite-group: fugue; - -sprite-image: fugue/tags.png; -} -.icon-button.tag--plus { - -sprite-group: fugue; - -sprite-image: fugue/tag--plus.png; -} -.icon-button.toggle-expand { - -sprite-group: fugue; - -sprite-image: fugue/toggle-expand.png; -} -.icon-button.toggle { - -sprite-group: fugue; - -sprite-image: fugue/toggle.png; -} -.icon-button.arrow-circle { - -sprite-group: fugue; - -sprite-image: fugue/arrow-circle.png; -} -.icon-button.chevron { - -sprite-group: fugue; - -sprite-image: fugue/chevron.png; -} -.icon-button.bug { - -sprite-group: fugue; - -sprite-image: fugue/bug.png; -} -.icon-button.disk { - -sprite-group: fugue; - -sprite-image: fugue/disk.png; -} -.icon-button.information { - -sprite-group: fugue; - -sprite-image: fugue/information-white.png; -} -.icon-button.annotate { - -sprite-group: fugue; - -sprite-image: fugue/sticky-note-text.png; -} -.icon-button.go-to-full-screen { - -sprite-group: fugue; - -sprite-image: fugue/external.png; -} -.icon-button.import { - -sprite-group: fugue; - -sprite-image: fugue/plus-circle.png; -} -.icon-button.plus-button { - -sprite-group: fugue; - -sprite-image: fugue/plus-button.png; -} -.icon-button.gear { - -sprite-group: fugue; - -sprite-image: fugue/gear.png; -} - -.icon-button.chart_curve { - background: url(../images/silk/chart_curve.png) no-repeat; -} - -.tipsy { - padding: 5px; - font-size: 10px; - filter: alpha(opacity=80); - background-repeat: no-repeat; - background-image: url(../images/tipsy.gif); -} -.tipsy-inner { - padding: 5px 8px 4px 8px; - background-color: black; - color: white; - max-width: 200px; - text-align: center; -} - -.tipsy-north { - background-position: top center; -} - -.tipsy-south { - background-position: bottom center; -} - -.tipsy-east { - background-position: right center; -} - -.tipsy-west { - background-position: left center; -} - -.editable-text { - cursor:pointer; -} - -.editable-text:hover { - cursor: text; - border: dotted #999999 1px; -} - -.text-and-autocomplete-select { - -sprite-group: fugue; - -sprite-image: fugue/control-270.png; - -sprite-horiz-position: right; -} -.icon-button.multiinput{ - background:url(../images/documents-stack.png) no-repeat; - cursor:pointer; - float:none; - display:inline-block; - margin-left:10px; -} -.icon-button.multiinput.disabled{ - background:url(../images/documents-stack-faded.png) no-repeat; - cursor:auto; -} -.workflow-invocation-complete{ - border:solid 1px #6A6; - border-left-width:5px; - margin:10px 0; - padding-left:5px; -} - diff -r b1dac5a9b1d7d01a9e55940a4546fc5ed6f79bd0 -r fca74f9562024605dd87a3a6ace02d28a1851f5e static/june_2007_style/base.less --- /dev/null +++ b/static/june_2007_style/base.less @@ -0,0 +1,886 @@ +@import "variables.less"; + +@import "galaxy_bootstrap.less"; + + +// Lucida Grande for proper mac unicode characters, verdana/arial stack for others +//body{font:13px/1.231 "Lucida Grande",verdana,arial,helvetica,sans-serif;*font-size:small;*font:x-small;}select,input,button,textarea,button{font:99% "Lucida Grande",verdana,arial,helvetica,sans-serif;}table{font-size:inherit;font:100%;}pre,code,kbd,samp,tt{font-family:monospace;*font-size:108%;line-height:100%;} +//body{font-size:75%;} + +// Mixins + +.unselectable { + user-select: none; + -moz-user-select: none; + -webkit-user-select: none; +} + +.shadow { + -moz-box-shadow: 0 3px 30px black; + -webkit-box-shadow: 0 3px 30px black; +} + +// Real styles + +body { + background: @base_bg_bottom; + color: @base_text; + background-image: url(base_bg.png); + background-repeat: repeat-x; + background-position: top; + margin: 10px; +} + +img { + border: 0; +} + + +a:link, a:visited, a:active { + color: @link_text; +} + +h1, h2, h3, h4 { + color: @header_text; + /*text-shadow: #bbb 2px 2px 1px;*/ +} + +h1:first-child, h2:first-child, h3:first-child, h4:first-child { + margin-top: 0px; +} + +hr { + border: none; + height: 0px; + border-bottom: dotted @base_text 1px; +} + +table { + border-collapse: collapse; +} + +th { + text-align: left; +} + +div.toolForm { + border: solid @form_border 1px; +} + +div.toolFormTitle { + font-weight: bold; + padding: 5px; + padding-left: 10px; + padding-right: 10px; + background: @form_title_bg_bottom; + // background-image: url(form_title_bg.png); + background-repeat: repeat-x; + background-position: top; + border-bottom: solid @form_border 1px; +} + +div.toolParamHelp { + color: #666; +} + +div.toolParamHelp a { + color: #666; +} + +div.toolFormBody { + background: @form_body_bg_bottom; + background-image: url(form_body_bg.png); + background-repeat: repeat-x; + background-position: top; + padding: 5px 0; +} + +div.toolFormBody div.toolFormTitle { + background: transparent; + border: none; + font-weight: bold; + border-bottom: solid @form_border 1px; + margin-bottom: 5px; +} + +div.toolFormDisabled div.toolFormTitle { + background: @layout_bg; + border-color: @layout_border; +} + +div.toolFormDisabled { + border-color: @layout_border; +} + +div.toolHelp { + margin-top: 10px; +} + +div.toolHelpBody { + width: 100%; +} + +div.metadataForm { + border:solid #aaaaaa 1px; +} + +div.metadataFormTitle { + font-weight:bold; + padding:5px; + padding-left:10px; + padding-right:10px; + background:#cccccc; + background-repeat:repeat-x; + background-position:top; + border-bottom:solid #aaaaaa 1px; +} + +div.metadataFormBody { + background:#FFFFFF; + background-image:url(form_body_bg.png); + background-repeat:repeat-x; + background-position:top; + padding:5px 0; +} + +div.metadataFormBody div.metadataFormTitle { + background:transparent; + border:none; + font-weight:bold; + border-bottom:solid #dcb790 1px; + margin-bottom:5px; +} + +div.metadataFormDisabled div.metadataFormTitle { + background:#eee; + border-color:#999; +} + +div.metadataFormDisabled { + border-color:#999; +} + +div.metadataHelpBody { + width:100%;overflow:auto; +} + +div.titleRow { + font-weight: bold; + border-bottom: dotted gray 1px; + margin-bottom: 0.5em; + padding-bottom: 0.25em; +} + +// Forms + +div.form { + border: solid @form_border 1px; +} + +div.form-title { + font-weight: bold; + padding: 5px 10px; + background: @form_title_bg_bottom; + background-image: url(form_title_bg.png); + background-repeat: repeat-x; + background-position: top; + border-bottom: solid @form_border 1px; +} + +div.form-body { + padding: 5px 0; +} + +div.form-row { + padding: 5px 10px; +} + +div.form-title-row { + padding: 5px 10px; +} + +div.repeat-group-item { + border-left: solid @form_border 5px; + margin-left: 10px; + margin-bottom: 10px; +} + +div.form-row-error { + background: @error_message_bg; +} + +div.form-row label { + font-weight: bold; + display: block; + margin-bottom: .2em; +} + +div.form-row label.inline { + display: inline; +} + +div.form-row-input { + float: left; +} + +div.form-row-input label { + font-weight: normal; + display: inline; +} + +div.form-row-error-message { + width: 300px; + float: left; + color: red; + font-weight: bold; + padding: 3px 0 0 1em; +} + +.form-row .help { + color: #666; +} + +select, input, textarea { + font: inherit; +} + +select, textarea, input[type="text"], input[type="file"], input[type="password"] { + // -webkit-box-sizing: border-box; + max-width: 300px; +} + +// Messages + +.errormessagelarge, .warningmessagelarge, .donemessagelarge, .infomessagelarge { + padding: 10px; + padding-left: 52px; + min-height: 32px; + border: 1px solid @error_message_border; + background-color: @error_message_bg; + background-image: url(error_message_icon.png); + background-repeat: no-repeat; + background-position: 10px 10px; +} + +.warningmessagelarge { + background-image: url(warn_message_icon.png); + border-color: @warn_message_border; + background-color: @warn_message_bg; +} + +.donemessagelarge { + background-image: url(done_message_icon.png); + border-color: @done_message_border; + background-color: @done_message_bg; +} + +.infomessagelarge { + background-image: url(info_message_icon.png); + border-color: @info_message_border; + background-color: @info_message_bg; +} + +.screencastBox { + padding-left: 10px; + border-color: #AAAA66; + background-color: #FFFFCC; + background-image: none; +} + +.errormessage, .warningmessage, .donemessage, .infomessage, .errormessagesmall, .warningmessagesmall, .donemessagesmall, .infomessagesmall { + padding: 5px; + padding-left: 25px; + min-height: 15px; + border: 1px solid @error_message_border; + background-color: @error_message_bg; + background-image: url(error_small.png); + background-repeat: no-repeat; + background-position: 5px 5px; +} + +.warningmessage, .warningmessagesmall { + background-image: url(warn_small.png); + border-color: @warn_message_border; + background-color: @warn_message_bg; +} + +.donemessage, .donemessagesmall { + background-image: url(ok_small.png); + border-color: @done_message_border; + background-color: @done_message_bg; +} + +.infomessage, .infomessagesmall { + background-image: url(info_small.png); + border-color: @info_message_border; + background-color: @info_message_bg; +} + +.errormark, .warningmark, .donemark, .infomark, .ok_bgr, .err_bgr { + padding-left: 20px; + min-height: 15px; + background: url(error_small.png) no-repeat; +} + +.warningmark { + background-image: url(warn_small.png); +} + +.donemark { + background-image: url(ok_small.png); +} + +.infomark, .ok_bgr { + background-image: url(info_small.png); +} + +table.simple { + font-size: 12px; + background: #fff; + margin: 1em; + border-collapse: collapse; + text-align: left; +} +table.simple th { + font-size: 14px; + font-weight: normal; + padding: 10px 8px; + border-bottom: 2px solid #333; +} +table.simple td { + padding: 10px 8px 0px 8px; +} +table.simple tbody tr:hover td { + color: #333; +} + +table.tabletip { + width: 100%; + border-collapse: collapse; + text-align: left; +} +table.tabletip th { + white-space: nowrap; + border-bottom: 1px solid #444; + padding-right: 3px; +} +table.tabletip td { + border-bottom: 1px solid #ddd; +} +table.tabletip tbody tr:hover td { + background-color: #eee; +} + +table.colored { + border-top: solid @table_border 1px; + border-bottom: solid @table_border 1px; +} + +table.colored td, table.colored th { + text-align: left; + padding: 5px; +} + +table.colored tr.header { + background: @table_header_bg; + background-image: url(form_title_bg.png); + background-repeat: repeat-x; + background-position: top; + border-bottom: solid @table_border 1px; + font-weight: bold; +} + +table.colored tr { + background: @table_row_bg; +} + +table.colored tr.odd_row { + background: @odd_row_bg; +} + +div.debug { + margin: 10px; + padding: 5px; + background: #FFFF99; + border: solid #FFFF33 1px; + color: black; +} + +div.odd_row { + background: @odd_row_bg; +} + +#footer { + display: none; +} + +// Tool panel stuff + +td.panel-body { + background: white; + color: @base_text; + background: @menu_bg_over url(menu_bg.png) top repeat-x; +} + +div.toolSectionPad { + margin: 0; + padding: 0; + height: 5px; + font-size: 0px; +} + +div.toolSectionDetailsInner { + margin-left: 5px; + margin-right: 5px; +} + +div.toolSectionTitle { + padding-bottom: 0px; + font-weight: bold; +} + +div.toolTitle { + padding-top: 5px; + padding-bottom: 5px; + margin-left: 16px; + margin-right: 10px; + display: list-item; + list-style: square outside; +} + +span.toolParameterExpandableCollapsable { + font-weight: bold; + cursor: pointer; +} +ul.toolParameterExpandableCollapsable { + list-style: none; +} + +ul.manage-table-actions { + float: right; + margin-top: -2.5em; +} +ul.manage-table-actions li { + display: block; + float: left; + margin-left: 0.5em; +} + +// State colors + +.state-color-new { + border-color: @history_new_border; + background: @history_new_bg; +} + +.state-color-upload { + border-color: @history_upload_border; + background: @history_upload_bg; +} + +.state-color-waiting { + border-color: @history_waiting_border; + background: @history_waiting_bg; +} + +.state-color-queued { + border-color: @history_queued_border; + background: @history_queued_bg; +} + +.state-color-running { + border-color: @history_running_border; + background: @history_running_bg; +} + +.state-color-ok { + border-color: @history_ok_border; + background: @history_ok_bg; +} + +.state-color-error { + border-color: @history_error_border; + background: @history_error_bg; +} + +.state-color-deleted { + border-color: @history_deleted_border; + background: @history_deleted_bg; +} + +.state-fg-new { + color: #FFB030; +} + +.state-fg-upload { + color: #D090D0; +} + +.state-fg-waiting { + color: #E8C060; +} + +.state-fg-queued { + color: #888888; +} + +.state-fg-running { + color: #AAAA66; +} + +.state-fg-ok { + color: #66AA66; +} + +.state-fg-error { + color: #AA6666; +} + +.state-fg-deleted { + color: #3399FF; +} + +// Button styles + +.action-button { + background: transparent; + line-height: 16px; + color: #333; + text-decoration: none; + font-size: 100%; + font-weight: bold; + display: inline-block; + cursor: pointer; + padding: 2px; + border: solid #aaaaaa 1px; + padding-right: 0.5em; + padding-left: 0.5em; + -moz-border-radius: 0.5em; + -webkit-border-radius: 0.5em; + border-radius: 0.5em; + user-select: none; + -moz-user-select: none; + -webkit-user-select: none; +} + +.action-button > * { + vertical-align: middle; +} + +.action-button:hover { + color: black; + background: #dddddd; +} +.action-button:active { + color: white; + background: #aaaaaa; +} + +// A menu button is a button that has an attached popup menu + +.menubutton { + display: inline-block; + cursor: pointer; + position: relative; + .unselectable; + + border: solid transparent 1px; + -moz-border-radius: 0.25em; + -webkit-border-radius: 0.25em; + border-radius: 0.25em; + + padding: 1px 0.25em; + margin: -1px -0.25em; + + .label { + position: relative; + display: block; + border-right: none; + } +} + +.menubutton.action-button { + border-color: #aaaaaa; +} + +.menubutton.popup, .action-button.popup { + padding-right: 20px; + background-image: url(../images/dropdownarrow.png); + background-repeat: no-repeat; + background-position: right 7px; +} + +.menubutton:hover { + border-color: #aaaaaa; + // background: #eeeeee; + // color: #333; +} + +// A split menu button, the main button has an action, the arrow causes the +// popup menu to appear + +.menubutton.popup.split { + padding-right: 2em; +} + +.menubutton.popup.split:hover { + background: url(../images/ddarrowsplit.png) no-repeat right -39px; +} + +// Popup menu styles + +.overlay-border { + position: absolute; + top: 0; + left: 0; + height: 100%; + width: 100%; + padding: 1em; + margin: -1em; + background-color: rgba(0,0,0,0.5); + -moz-border-radius: 1em; + -webkit-border-radius: 1em; + z-index: -1; +} + +div.popmenu-wrapper { + + position: absolute; + top: 100%; + z-index: 20000; + + ul { + + display: block; + margin: 0; + padding: 0; + + background: white; + color: #333; + font-weight: bold; + font-style: normal; + white-space: nowrap; + border: solid #aaaaaa 1px; + padding: 3px 0; + -moz-border-radius: 0.5em; + -webkit-border-radius: 0.5em; + border-radius: 0.5em; + // margin: -3px -0.5em; + // min-width: 100%; + + .unselectable; + + li { + display: block; + padding: 3px 1em; + cursor: pointer; + border-top: solid transparent 1px; + border-bottom: solid transparent 1px; + } + + li.head { + color: #999; + font-style: italic; + } + } +} + +div.popmenu-wrapper ul li:hover { + background: #EEEEFF; + border-color: #aaa; +} + +div.popmenu-wrapper ul li.head:hover { + background: inherit; + border-color: transparent; +} + +.popup-arrow { + cursor: pointer; + text-decoration: none; + color: #555; +} + +.popup-arrow:hover { + color: black; +} + +div.permissionContainer { + padding-left: 20px; +} + +// Data grid style + +.grid-header { + padding-bottom: 1em; +} + +.grid-header h2 { + margin: 0; + margin-bottom: 0.5em; +} + +.grid-header .title { + font-weight: bold; +} + +.grid { + padding-top: 1em; + border-collapse: collapse; + width: 100%; +} +.grid tbody td { + border-top: solid #DDDDDD 1px; + border-bottom: solid #DDDDDD 1px; + padding: 0.3em 0.5em; +} +.grid tbody td:empty { + padding: 0; +} +.grid thead tr { + height: 2em; +} +.grid thead th { + background: @table_header_bg; + // background-image: url(form_title_bg.png); + background-repeat: repeat-x; + background-position: top; + border-top: solid @table_border 1px; + border-bottom: solid @table_border 1px; + padding: 0.3em 0.5em; + text-align: left; + white-space: nowrap; +} +.grid tfoot td { + background-color: #F8F8F8; + border-top: solid #DDDDDD 1px; + border-bottom: solid #DDDDDD 1px; + padding: 0.3em 0.5em; +} +.grid .current { + background-color: #EEEEFF; +} + +// Styles for areas of text content + +.text-content { + + hr { + display:block; + background:black; + color:black; + width:100%; + height:1px; + border:none; + background:#aaa; + color:#aaa; + } + + table + { + border-collapse:collapse; + border-top:1px solid #ccc; + border-left:1px solid #ccc; + } + + blockquote { + color:#666; + } + + fieldset { + border-color:#ccc; + border:1px solid #ccc; + } + + th,td { + border-bottom:1px solid #ddd; + border-right:1px solid #ccc; + } + + th,td { + padding:.8em; + } + +} + +// Icon buttons. + +.icon-button { + width: 16px; + height: 16px; + display: block; + float: left; + margin-left: 2px; + // Allow alt text for screen readers + text-indent: 20px; + background-repeat:no-repeat; + background-position: 0px 0px; + padding: 0; +} + +@import "base_sprites"; + +.tipsy { + padding: 5px; + font-size: 10px; + filter: alpha(opacity=80); + background-repeat: no-repeat; + background-image: url(../images/tipsy.gif); +} +.tipsy-inner { + padding: 5px 8px 4px 8px; + background-color: black; + color: white; + max-width: 200px; + text-align: center; +} + +.tipsy-north { + background-position: top center; +} + +.tipsy-south { + background-position: bottom center; +} + +.tipsy-east { + background-position: right center; +} + +.tipsy-west { + background-position: left center; +} + +.editable-text { + cursor:pointer; +} + +.editable-text:hover { + cursor: text; + border: dotted #999999 1px; +} +/* +.text-and-autocomplete-select { + -sprite-group: fugue; + -sprite-image: fugue/control-270.png; + -sprite-horiz-position: right; +} +*/ +.icon-button.multiinput{ + background:url(../images/documents-stack.png) no-repeat; + cursor:pointer; + float:none; + display:inline-block; + margin-left:10px; +} +.icon-button.multiinput.disabled{ + background:url(../images/documents-stack-faded.png) no-repeat; + cursor:auto; +} +.workflow-invocation-complete{ + border:solid 1px #6A6; + border-left-width:5px; + margin:10px 0; + padding-left:5px; +} + diff -r b1dac5a9b1d7d01a9e55940a4546fc5ed6f79bd0 -r fca74f9562024605dd87a3a6ace02d28a1851f5e static/june_2007_style/base_sprites.less.tmpl --- /dev/null +++ b/static/june_2007_style/base_sprites.less.tmpl @@ -0,0 +1,102 @@ +.icon-button.display { + -sprite-group: history-buttons; + -sprite-image: eye_icon.png; +} +.icon-button.display:hover { + -sprite-group: history-buttons; + -sprite-image: eye_icon_dark.png; +} +.icon-button.display_disabled { + -sprite-group: history-buttons; + -sprite-image: eye_icon_grey.png; +} +.icon-button.delete { + -sprite-group: history-buttons; + -sprite-image: delete_icon.png; +} +.icon-button.delete:hover { + -sprite-group: history-buttons; + -sprite-image: delete_icon_dark.png; +} +.icon-button.delete_disabled { + -sprite-group: history-buttons; + -sprite-image: delete_icon_grey.png; +} +.icon-button.edit { + -sprite-group: history-buttons; + -sprite-image: pencil_icon.png; +} +.icon-button.edit:hover { + -sprite-group: history-buttons; + -sprite-image: pencil_icon_dark.png; +} +.icon-button.edit_disabled { + -sprite-group: history-buttons; + -sprite-image: pencil_icon_grey.png; +} +.icon-button.tag { + -sprite-group: fugue; + -sprite-image: fugue/tag-label.png; +} +.icon-button.tags { + -sprite-group: fugue; + -sprite-image: fugue/tags.png; +} +.icon-button.tag--plus { + -sprite-group: fugue; + -sprite-image: fugue/tag--plus.png; +} +.icon-button.toggle-expand { + -sprite-group: fugue; + -sprite-image: fugue/toggle-expand.png; +} +.icon-button.toggle { + -sprite-group: fugue; + -sprite-image: fugue/toggle.png; +} +.icon-button.arrow-circle { + -sprite-group: fugue; + -sprite-image: fugue/arrow-circle.png; +} +.icon-button.chevron { + -sprite-group: fugue; + -sprite-image: fugue/chevron.png; +} +.icon-button.bug { + -sprite-group: fugue; + -sprite-image: fugue/bug.png; +} +.icon-button.disk { + -sprite-group: fugue; + -sprite-image: fugue/disk.png; +} +.icon-button.information { + -sprite-group: fugue; + -sprite-image: fugue/information-white.png; +} +.icon-button.annotate { + -sprite-group: fugue; + -sprite-image: fugue/sticky-note-text.png; +} +.icon-button.go-to-full-screen { + -sprite-group: fugue; + -sprite-image: fugue/external.png; +} +.icon-button.import { + -sprite-group: fugue; + -sprite-image: fugue/plus-circle.png; +} +.icon-button.plus-button { + -sprite-group: fugue; + -sprite-image: fugue/plus-button.png; +} +.icon-button.gear { + -sprite-group: fugue; + -sprite-image: fugue/gear.png; +} + +.text-and-autocomplete-select { + -sprite-group: fugue; + -sprite-image: fugue/control-270.png; + -sprite-horiz-position: right; +} \ No newline at end of file diff -r b1dac5a9b1d7d01a9e55940a4546fc5ed6f79bd0 -r fca74f9562024605dd87a3a6ace02d28a1851f5e static/june_2007_style/blue/base.css --- a/static/june_2007_style/blue/base.css +++ b/static/june_2007_style/blue/base.css @@ -1,8 +1,171 @@ -body{font:13px/1.231 "Lucida Grande",verdana,arial,helvetica,sans-serif;*font-size:small;*font:x-small;} -select,input,button,textarea,button{font:99% "Lucida Grande",verdana,arial,helvetica,sans-serif;} -table{font-size:inherit;font:100%;} -pre,code,kbd,samp,tt{font-family:monospace;*font-size:108%;line-height:100%;} -body{font-size:75%;} +article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block;} +audio,canvas,video{display:inline-block;*display:inline;*zoom:1;} +audio:not([controls]){display:none;} +html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;} +a:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;} +a:hover,a:active{outline:0;} +sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline;} +sup{top:-0.5em;} +sub{bottom:-0.25em;} +img{max-width:100%;height:auto;border:0;-ms-interpolation-mode:bicubic;} +button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle;} +button,input{*overflow:visible;line-height:normal;} +button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0;} +button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button;} +input[type="search"]{-webkit-appearance:textfield;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;} +input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none;} +textarea{overflow:auto;vertical-align:top;} +body{margin:0;font-family:"Lucida Grande",verdana,arial,helvetica,sans-serif;font-size:12px;line-height:16px;color:#333333;background-color:#ffffff;} +a{color:#0088cc;text-decoration:none;} +a:hover{color:#005580;text-decoration:underline;} +p{margin:0 0 8px;font-family:"Lucida Grande",verdana,arial,helvetica,sans-serif;font-size:12px;line-height:16px;}p small{font-size:10px;color:#999999;} +.lead{margin-bottom:16px;font-size:20px;font-weight:200;line-height:24px;} +h1,h2,h3,h4,h5,h6{margin:0;font-weight:bold;color:#333333;text-rendering:optimizelegibility;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;color:#999999;} +h1{font-size:30px;line-height:32px;}h1 small{font-size:18px;} +h2{font-size:24px;line-height:32px;}h2 small{font-size:18px;} +h3{line-height:24px;font-size:18px;}h3 small{font-size:14px;} +h4,h5,h6{line-height:16px;} +h4{font-size:14px;}h4 small{font-size:12px;} +h5{font-size:12px;} +h6{font-size:11px;color:#999999;text-transform:uppercase;} +.page-header{padding-bottom:15px;margin:16px 0;border-bottom:1px solid #eeeeee;} +.page-header h1{line-height:1;} +ul,ol{padding:0;margin:0 0 8px 25px;} +ul ul,ul ol,ol ol,ol ul{margin-bottom:0;} +ul{list-style:disc;} +ol{list-style:decimal;} +li{line-height:16px;} +ul.unstyled{margin-left:0;list-style:none;} +dl{margin-bottom:16px;} +dt,dd{line-height:16px;} +dt{font-weight:bold;} +dd{margin-left:8px;} +hr{margin:16px 0;border:0;border-top:1px solid #e5e5e5;border-bottom:1px solid #ffffff;} +strong{font-weight:bold;} +em{font-style:italic;} +.muted{color:#999999;} +abbr{font-size:90%;text-transform:uppercase;border-bottom:1px dotted #ddd;cursor:help;} +blockquote{padding:0 0 0 15px;margin:0 0 16px;border-left:5px solid #eeeeee;}blockquote p{margin-bottom:0;font-size:16px;font-weight:300;line-height:20px;} +blockquote small{display:block;line-height:16px;color:#999999;}blockquote small:before{content:'\2014 \00A0';} +blockquote.pull-right{float:right;padding-left:0;padding-right:15px;border-left:0;border-right:5px solid #eeeeee;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;} +q:before,q:after,blockquote:before,blockquote:after{content:"";} +address{display:block;margin-bottom:16px;line-height:16px;font-style:normal;} +small{font-size:100%;} +cite{font-style:normal;} +code,pre{padding:0 3px 2px;font-family:Menlo,Monaco,"Courier New",monospace;font-size:11px;color:#333333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +code{padding:3px 4px;color:#d14;background-color:#f7f7f9;border:1px solid #e1e1e8;} +pre{display:block;padding:7.5px;margin:0 0 8px;font-size:12px;line-height:16px;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;white-space:pre;white-space:pre-wrap;word-break:break-all;}pre.prettyprint{margin-bottom:16px;} +pre code{padding:0;background-color:transparent;} +form{margin:0 0 16px;} +fieldset{padding:0;margin:0;border:0;} +legend{display:block;width:100%;padding:0;margin-bottom:24px;font-size:18px;line-height:32px;color:#333333;border:0;border-bottom:1px solid #eee;} +label,input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:12px;font-weight:normal;line-height:16px;} +label{display:block;margin-bottom:5px;color:#333333;} +input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:16px;padding:4px;margin-bottom:9px;font-size:12px;line-height:16px;color:#555555;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +.uneditable-textarea{width:auto;height:auto;} +label input,label textarea,label select{display:block;} +input[type="image"],input[type="checkbox"],input[type="radio"]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;border:0;cursor:pointer;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} +input[type="file"]{padding:initial;line-height:initial;border:initial;background-color:#ffffff;background-color:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} +input[type="button"],input[type="reset"],input[type="submit"]{width:auto;height:auto;} +select,input[type="file"]{height:28px;*margin-top:4px;line-height:28px;} +select{width:220px;background-color:#ffffff;} +select[multiple],select[size]{height:auto;} +input[type="image"]{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} +textarea{height:auto;} +input[type="hidden"]{display:none;} +.radio,.checkbox{padding-left:18px;} +.radio input[type="radio"],.checkbox input[type="checkbox"]{float:left;margin-left:-18px;} +.controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:5px;} +.radio.inline,.checkbox.inline{display:inline-block;margin-bottom:0;vertical-align:middle;} +.radio.inline+.radio.inline,.checkbox.inline+.checkbox.inline{margin-left:10px;} +.controls>.radio.inline:first-child,.controls>.checkbox.inline:first-child{padding-top:0;} +input,textarea{-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;} +input:focus,textarea:focus{border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);outline:0;outline:thin dotted \9;} +input[type="file"]:focus,input[type="checkbox"]:focus,select:focus{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;} +.input-mini{width:60px;} +.input-small{width:90px;} +.input-medium{width:150px;} +.input-large{width:210px;} +.input-xlarge{width:270px;} +.input-xxlarge{width:530px;} +input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{float:none;margin-left:0;} +input.span1,textarea.span1,.uneditable-input.span1{width:50px;} +input.span2,textarea.span2,.uneditable-input.span2{width:130px;} +input.span3,textarea.span3,.uneditable-input.span3{width:210px;} +input.span4,textarea.span4,.uneditable-input.span4{width:290px;} +input.span5,textarea.span5,.uneditable-input.span5{width:370px;} +input.span6,textarea.span6,.uneditable-input.span6{width:450px;} +input.span7,textarea.span7,.uneditable-input.span7{width:530px;} +input.span8,textarea.span8,.uneditable-input.span8{width:610px;} +input.span9,textarea.span9,.uneditable-input.span9{width:690px;} +input.span10,textarea.span10,.uneditable-input.span10{width:770px;} +input.span11,textarea.span11,.uneditable-input.span11{width:850px;} +input.span12,textarea.span12,.uneditable-input.span12{width:930px;} +input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{background-color:#f5f5f5;border-color:#ddd;cursor:not-allowed;} +.control-group.warning>label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#c09853;} +.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#c09853;border-color:#c09853;}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#a47e3c;-webkit-box-shadow:0 0 6px #dbc59e;-moz-box-shadow:0 0 6px #dbc59e;box-shadow:0 0 6px #dbc59e;} +.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#c09853;background-color:#fcf8e3;border-color:#c09853;} +.control-group.error>label,.control-group.error .help-block,.control-group.error .help-inline{color:#b94a48;} +.control-group.error input,.control-group.error select,.control-group.error textarea{color:#b94a48;border-color:#b94a48;}.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#953b39;-webkit-box-shadow:0 0 6px #d59392;-moz-box-shadow:0 0 6px #d59392;box-shadow:0 0 6px #d59392;} +.control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#b94a48;background-color:#f2dede;border-color:#b94a48;} +.control-group.success>label,.control-group.success .help-block,.control-group.success .help-inline{color:#468847;} +.control-group.success input,.control-group.success select,.control-group.success textarea{color:#468847;border-color:#468847;}.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#356635;-webkit-box-shadow:0 0 6px #7aba7b;-moz-box-shadow:0 0 6px #7aba7b;box-shadow:0 0 6px #7aba7b;} +.control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#468847;background-color:#dff0d8;border-color:#468847;} +input:focus:required:invalid,textarea:focus:required:invalid,select:focus:required:invalid{color:#b94a48;border-color:#ee5f5b;}input:focus:required:invalid:focus,textarea:focus:required:invalid:focus,select:focus:required:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;} +.form-actions{padding:15px 20px 16px;margin-top:16px;margin-bottom:16px;background-color:#f5f5f5;border-top:1px solid #ddd;} +.uneditable-input{display:block;background-color:#ffffff;border-color:#eee;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);cursor:not-allowed;} +:-moz-placeholder{color:#999999;} +::-webkit-input-placeholder{color:#999999;} +.help-block{margin-top:5px;margin-bottom:0;color:#999999;} +.help-inline{display:inline-block;*display:inline;*zoom:1;margin-bottom:9px;vertical-align:middle;padding-left:5px;} +.input-prepend,.input-append{margin-bottom:5px;*zoom:1;}.input-prepend:before,.input-append:before,.input-prepend:after,.input-append:after{display:table;content:"";} +.input-prepend:after,.input-append:after{clear:both;} +.input-prepend input,.input-append input,.input-prepend .uneditable-input,.input-append .uneditable-input{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}.input-prepend input:focus,.input-append input:focus,.input-prepend .uneditable-input:focus,.input-append .uneditable-input:focus{position:relative;z-index:2;} +.input-prepend .uneditable-input,.input-append .uneditable-input{border-left-color:#ccc;} +.input-prepend .add-on,.input-append .add-on{float:left;display:block;width:auto;min-width:16px;height:16px;margin-right:-1px;padding:4px 5px;font-weight:normal;line-height:16px;color:#999999;text-align:center;text-shadow:0 1px 0 #ffffff;background-color:#f5f5f5;border:1px solid #ccc;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} +.input-prepend .active,.input-append .active{background-color:#a9dba9;border-color:#46a546;} +.input-prepend .add-on{*margin-top:1px;} +.input-append input,.input-append .uneditable-input{float:left;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} +.input-append .uneditable-input{border-right-color:#ccc;} +.input-append .add-on{margin-right:0;margin-left:-1px;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} +.input-append input:first-child{*margin-left:-160px;}.input-append input:first-child+.add-on{*margin-left:-21px;} +.search-query{padding-left:14px;padding-right:14px;margin-bottom:0;-webkit-border-radius:14px;-moz-border-radius:14px;border-radius:14px;} +.form-search input,.form-inline input,.form-horizontal input,.form-search textarea,.form-inline textarea,.form-horizontal textarea,.form-search select,.form-inline select,.form-horizontal select,.form-search .help-inline,.form-inline .help-inline,.form-horizontal .help-inline,.form-search .uneditable-input,.form-inline .uneditable-input,.form-horizontal .uneditable-input{display:inline-block;margin-bottom:0;} +.form-search label,.form-inline label,.form-search .input-append,.form-inline .input-append,.form-search .input-prepend,.form-inline .input-prepend{display:inline-block;} +.form-search .input-append .add-on,.form-inline .input-prepend .add-on,.form-search .input-append .add-on,.form-inline .input-prepend .add-on{vertical-align:middle;} +.control-group{margin-bottom:8px;} +.form-horizontal legend+.control-group{margin-top:16px;-webkit-margin-top-collapse:separate;} +.form-horizontal .control-group{margin-bottom:16px;*zoom:1;}.form-horizontal .control-group:before,.form-horizontal .control-group:after{display:table;content:"";} +.form-horizontal .control-group:after{clear:both;} +.form-horizontal .control-group>label{float:left;width:140px;padding-top:5px;text-align:right;} +.form-horizontal .controls{margin-left:160px;} +.form-horizontal .form-actions{padding-left:160px;} +table{max-width:100%;border-collapse:collapse;border-spacing:0;} +.table{width:100%;margin-bottom:16px;}.table th,.table td{padding:8px;line-height:16px;text-align:left;border-top:1px solid #ddd;} +.table th{font-weight:bold;vertical-align:bottom;} +.table td{vertical-align:top;} +.table thead:first-child tr th,.table thead:first-child tr td{border-top:0;} +.table tbody+tbody{border-top:2px solid #ddd;} +.table-condensed th,.table-condensed td{padding:4px 5px;} +.table-bordered{border:1px solid #ddd;border-collapse:separate;*border-collapse:collapsed;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.table-bordered th+th,.table-bordered td+td,.table-bordered th+td,.table-bordered td+th{border-left:1px solid #ddd;} +.table-bordered thead:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child td{border-top:0;} +.table-bordered thead:first-child tr:first-child th:first-child,.table-bordered tbody:first-child tr:first-child td:first-child{-webkit-border-radius:4px 0 0 0;-moz-border-radius:4px 0 0 0;border-radius:4px 0 0 0;} +.table-bordered thead:first-child tr:first-child th:last-child,.table-bordered tbody:first-child tr:first-child td:last-child{-webkit-border-radius:0 4px 0 0;-moz-border-radius:0 4px 0 0;border-radius:0 4px 0 0;} +.table-bordered thead:last-child tr:last-child th:first-child,.table-bordered tbody:last-child tr:last-child td:first-child{-webkit-border-radius:0 0 0 4px;-moz-border-radius:0 0 0 4px;border-radius:0 0 0 4px;} +.table-bordered thead:last-child tr:last-child th:last-child,.table-bordered tbody:last-child tr:last-child td:last-child{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} +.table-striped tbody tr:nth-child(odd) td,.table-striped tbody tr:nth-child(odd) th{background-color:#f9f9f9;} +table .span1{float:none;width:44px;margin-left:0;} +table .span2{float:none;width:124px;margin-left:0;} +table .span3{float:none;width:204px;margin-left:0;} +table .span4{float:none;width:284px;margin-left:0;} +table .span5{float:none;width:364px;margin-left:0;} +table .span6{float:none;width:444px;margin-left:0;} +table .span7{float:none;width:524px;margin-left:0;} +table .span8{float:none;width:604px;margin-left:0;} +table .span9{float:none;width:684px;margin-left:0;} +table .span10{float:none;width:764px;margin-left:0;} +table .span11{float:none;width:844px;margin-left:0;} +table .span12{float:none;width:924px;margin-left:0;} .unselectable{user-select:none;-moz-user-select:none;-webkit-user-select:none;} .shadow{-moz-box-shadow:0 3px 30px black;-webkit-box-shadow:0 3px 30px black;} body{background:#ffffff;color:#303030;background-image:url(base_bg.png);background-repeat:repeat-x;background-position:top;margin:10px;} @@ -45,7 +208,7 @@ div.form-row-error-message{width:300px;float:left;color:red;font-weight:bold;padding:3px 0 0 1em;} .form-row .help{color:#666;} select,input,textarea{font:inherit;} -select,textarea,input[type="text"],input[type="file"],input[type="password"]{-webkit-box-sizing:border-box;max-width:300px;} +select,textarea,input[type="text"],input[type="file"],input[type="password"]{max-width:300px;} .errormessagelarge,.warningmessagelarge,.donemessagelarge,.infomessagelarge{padding:10px;padding-left:52px;min-height:32px;border:1px solid #aa6666;background-color:#ffcccc;background-image:url(error_message_icon.png);background-repeat:no-repeat;background-position:10px 10px;} .warningmessagelarge{background-image:url(warn_message_icon.png);border-color:#aaaa66;background-color:#ffffcc;} .donemessagelarge{background-image:url(done_message_icon.png);border-color:#66aa66;background-color:#ccffcc;} diff -r b1dac5a9b1d7d01a9e55940a4546fc5ed6f79bd0 -r fca74f9562024605dd87a3a6ace02d28a1851f5e static/june_2007_style/blue/panel_layout.css --- a/static/june_2007_style/blue/panel_layout.css +++ b/static/june_2007_style/blue/panel_layout.css @@ -1,340 +1,618 @@ -body { - font: 75% "Lucida Grande", verdana, arial, helvetica, sans-serif; - background: #eeeeee; -} -.unselectable { - user-select: none; - -moz-user-select: none; - -webkit-user-select: none; -} -#background { - position: absolute; - background: #eeeeee; - z-index: -1; - top: 0; - left: 0; - margin: 0; - padding: 0; - width: 100%; - height: 100%; -} -#messagebox { - position: absolute; - top: 33px; - left: 0; - width: 100%; - height: 24px !important; - overflow: hidden; - border-bottom: solid #999 1px; - font-size: 90%; -} -#left, -#left-border, -#center, -#right-border, -#right { - position: absolute; - top: 39px; - bottom: 0px; - overflow: hidden; - background: #fff; -} -#left, -#center, -#right { - border-top: solid #999999 1px; -} -#left-border, -#right-border { - background: #eeeeee; - border-left: solid #999999 1px; - border-right: solid #999999 1px; - padding-right: 1px; - padding-left: 1px; - width: 5px; - z-index: 10000; -} -#left-border div, -#right-border div { - width: 100%; - height: 100%; - background-repeat: no-repeat; - background-position: center center; - position: absolute; - width: 5px; - height: 100%; -} -#left-border div, -#right-border.hidden div { - background-image: url(tiny_arrow_left.png); - cursor: w-resize; -} -#left-border.hidden div, -#right-border div { - background-image: url(tiny_arrow_right.png); - cursor: e-resize; -} -#left-border.hover div, -#right-border.hover div { - background-color: #aaaaee; -} -#left { - left: 0px; - width: 250px; - z-index: 200; -} -#left-border { - left: 250px; -} -#center { - left: 259px; - right: 259px; - overflow: hidden; - z-index: 1; -} -#right-border { - right: 250px; -} -#right { - width: 250px; - right: 0px; - z-index: 200; -} -.unified-panel-header { - height: 2em; - z-index: 1000; - background: #cccccc; - background-image: url(panel_header_bg.png); - background-position: top center; - background-repeat: repeat-x; - border-bottom: solid #999999 1px; - margin: 0; - padding: 0; - padding-right: 10px; - padding-left: 10px; - color: #333; - font-weight: bold; -} -.unified-panel-header-inner { - padding-top: 0.45em; -} -.menu-bg { - background: #c1c9e5 url(menu_bg.png) top repeat-x; -} -div.unified-panel-body { - position: absolute; - top: 2em; - bottom: 0; - width: 100%; - margin-top: 1px; -} -.panel-header-button { - color: #333; - text-decoration: none; - display: inline-block; - cursor: pointer; - margin: -1px; - padding: 1px; - margin-top: -0.2em; - border: solid #999 1px; - padding-right: 0.5em; - padding-left: 0.5em; - -moz-border-radius: 0.5em; - -webkit-border-radius: 0.5em; - border-radius: 0.5em; -} -.panel-header-button.popup { - padding-right: 1.75em; - background: url(../images/dropdownarrow.png) no-repeat right 7px; -} -.panel-header-button:hover { - color: black; - background-color: #ccc; -} -.panel-header-button:active { - color: white; - background-color: #aaaaaa; -} -#overlay { - position: fixed; - top: 0; - left: 0; - width: 100%; - height: 100%; - z-index: 20000; -} -#overlay.modal #overlay-background { - background: rgba(0, 0, 0, 0.5); -} -.dialog-box-container { - position: relative; - margin-top: 80px; - margin-right: auto; - margin-left: auto; -} -.dialog-box-wrapper { - position: relative; - padding: 1em; - background-color: rgba(0, 0, 0, 0.5); - -moz-border-radius: 1em; - -webkit-border-radius: 1em; -} -.dialog-box { - border: solid #999 1px; - background: white; - z-index: 80000; -} -#overlay.modal .dialog-box .body { - min-width: 600px; -} -.dialog-box .body { - padding: 5px; - overflow: auto; - max-height: 500px; - min-width: 300px; -} -.dialog-box .buttons { - padding: 5px; -} -.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; -} -.panel-done-message { - background-image: url(done_small.png); - background-color: #ccffcc; -} -.panel-info-message { - background-image: url(info_small.png); - background-color: #ccccff; -} -#masthead { - position: absolute; - top: 0; - left: 0; - width: 100%; - min-width: 900px; - height: 32px; - background: #2c3143; - color: #fff; - border-bottom: solid #444444 1px; - z-index: 15000; - padding: 0; -} -#masthead a { - color: #eeeeee; - text-decoration: none; -} -#masthead .title { - font-family: verdana; - padding: 3px 10px; - font-size: 175%; - font-weight: bold; - z-index: -1; -} -#masthead a:hover { - text-decoration: underline; -} -.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: #c1c9e5; -} -.quota-meter-bar { - position: absolute; - top: 0; - left: 0; - height: 16px; - background-color: #969db3; -} -.quota-meter-bar-warn { - background-color: #ffb400; -} -.quota-meter-bar-error { - background-color: #ff4343; -} -.quota-meter-text { - position: absolute; - top: 50%; - left: 0; - width: 100px; - height: 16px; - margin-top: -6px; - text-align: center; - z-index: 9001; - color: #000000; -} -.tab-group { - margin: 0; - padding: 0 10px; - height: 100%; - white-space: nowrap; - cursor: default; - background: transparent; -} -.tab-group .tab { - background: #2c3143; - position: relative; - float: left; - margin: 0; - padding: 0 1em; - height: 32px; - line-height: 32px; - text-align: left; -} -.tab-group .tab .submenu { - display: none; - position: absolute; - z-index: 16000; - left: 0; - top: 32px; - padding: 1em; - margin: -1em; - padding-top: 0; - margin-top: 0; - background-color: rgba(0, 0, 0, 0.5); - -moz-border-radius: 0 0 1em 1em; - -webkit-border-bottom-right-radius: 1em; - -webkit-border-bottom-left-radius: 1em; -} -.tab-group .tab .submenu ul { - display: block; - margin: 0; - padding: 0; - list-style-type: none; - background: #2c3143; -} -.tab-group .tab .submenu ul li { - display: block; - padding: 0 1em; - white-space: nowrap; -} -.tab-group .tab:hover > a { - color: gold !important; -} -.tab-group .active { - background: #010101; -} +article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block;} +audio,canvas,video{display:inline-block;*display:inline;*zoom:1;} +audio:not([controls]){display:none;} +html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;} +a:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;} +a:hover,a:active{outline:0;} +sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline;} +sup{top:-0.5em;} +sub{bottom:-0.25em;} +img{max-width:100%;height:auto;border:0;-ms-interpolation-mode:bicubic;} +button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle;} +button,input{*overflow:visible;line-height:normal;} +button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0;} +button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button;} +input[type="search"]{-webkit-appearance:textfield;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;} +input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none;} +textarea{overflow:auto;vertical-align:top;} +body{margin:0;font-family:"Lucida Grande",verdana,arial,helvetica,sans-serif;font-size:12px;line-height:16px;color:#333333;background-color:#ffffff;} +a{color:#0088cc;text-decoration:none;} +a:hover{color:#005580;text-decoration:underline;} +p{margin:0 0 8px;font-family:"Lucida Grande",verdana,arial,helvetica,sans-serif;font-size:12px;line-height:16px;}p small{font-size:10px;color:#999999;} +.lead{margin-bottom:16px;font-size:20px;font-weight:200;line-height:24px;} +h1,h2,h3,h4,h5,h6{margin:0;font-weight:bold;color:#333333;text-rendering:optimizelegibility;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;color:#999999;} +h1{font-size:30px;line-height:32px;}h1 small{font-size:18px;} +h2{font-size:24px;line-height:32px;}h2 small{font-size:18px;} +h3{line-height:24px;font-size:18px;}h3 small{font-size:14px;} +h4,h5,h6{line-height:16px;} +h4{font-size:14px;}h4 small{font-size:12px;} +h5{font-size:12px;} +h6{font-size:11px;color:#999999;text-transform:uppercase;} +.page-header{padding-bottom:15px;margin:16px 0;border-bottom:1px solid #eeeeee;} +.page-header h1{line-height:1;} +ul,ol{padding:0;margin:0 0 8px 25px;} +ul ul,ul ol,ol ol,ol ul{margin-bottom:0;} +ul{list-style:disc;} +ol{list-style:decimal;} +li{line-height:16px;} +ul.unstyled{margin-left:0;list-style:none;} +dl{margin-bottom:16px;} +dt,dd{line-height:16px;} +dt{font-weight:bold;} +dd{margin-left:8px;} +hr{margin:16px 0;border:0;border-top:1px solid #e5e5e5;border-bottom:1px solid #ffffff;} +strong{font-weight:bold;} +em{font-style:italic;} +.muted{color:#999999;} +abbr{font-size:90%;text-transform:uppercase;border-bottom:1px dotted #ddd;cursor:help;} +blockquote{padding:0 0 0 15px;margin:0 0 16px;border-left:5px solid #eeeeee;}blockquote p{margin-bottom:0;font-size:16px;font-weight:300;line-height:20px;} +blockquote small{display:block;line-height:16px;color:#999999;}blockquote small:before{content:'\2014 \00A0';} +blockquote.pull-right{float:right;padding-left:0;padding-right:15px;border-left:0;border-right:5px solid #eeeeee;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;} +q:before,q:after,blockquote:before,blockquote:after{content:"";} +address{display:block;margin-bottom:16px;line-height:16px;font-style:normal;} +small{font-size:100%;} +cite{font-style:normal;} +code,pre{padding:0 3px 2px;font-family:Menlo,Monaco,"Courier New",monospace;font-size:11px;color:#333333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +code{padding:3px 4px;color:#d14;background-color:#f7f7f9;border:1px solid #e1e1e8;} +pre{display:block;padding:7.5px;margin:0 0 8px;font-size:12px;line-height:16px;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;white-space:pre;white-space:pre-wrap;word-break:break-all;}pre.prettyprint{margin-bottom:16px;} +pre code{padding:0;background-color:transparent;} +form{margin:0 0 16px;} +fieldset{padding:0;margin:0;border:0;} +legend{display:block;width:100%;padding:0;margin-bottom:24px;font-size:18px;line-height:32px;color:#333333;border:0;border-bottom:1px solid #eee;} +label,input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:12px;font-weight:normal;line-height:16px;} +label{display:block;margin-bottom:5px;color:#333333;} +input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:16px;padding:4px;margin-bottom:9px;font-size:12px;line-height:16px;color:#555555;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +.uneditable-textarea{width:auto;height:auto;} +label input,label textarea,label select{display:block;} +input[type="image"],input[type="checkbox"],input[type="radio"]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;border:0;cursor:pointer;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} +input[type="file"]{padding:initial;line-height:initial;border:initial;background-color:#ffffff;background-color:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} +input[type="button"],input[type="reset"],input[type="submit"]{width:auto;height:auto;} +select,input[type="file"]{height:28px;*margin-top:4px;line-height:28px;} +select{width:220px;background-color:#ffffff;} +select[multiple],select[size]{height:auto;} +input[type="image"]{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} +textarea{height:auto;} +input[type="hidden"]{display:none;} +.radio,.checkbox{padding-left:18px;} +.radio input[type="radio"],.checkbox input[type="checkbox"]{float:left;margin-left:-18px;} +.controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:5px;} +.radio.inline,.checkbox.inline{display:inline-block;margin-bottom:0;vertical-align:middle;} +.radio.inline+.radio.inline,.checkbox.inline+.checkbox.inline{margin-left:10px;} +.controls>.radio.inline:first-child,.controls>.checkbox.inline:first-child{padding-top:0;} +input,textarea{-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;} +input:focus,textarea:focus{border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);outline:0;outline:thin dotted \9;} +input[type="file"]:focus,input[type="checkbox"]:focus,select:focus{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;} +.input-mini{width:60px;} +.input-small{width:90px;} +.input-medium{width:150px;} +.input-large{width:210px;} +.input-xlarge{width:270px;} +.input-xxlarge{width:530px;} +input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{float:none;margin-left:0;} +input.span1,textarea.span1,.uneditable-input.span1{width:50px;} +input.span2,textarea.span2,.uneditable-input.span2{width:130px;} +input.span3,textarea.span3,.uneditable-input.span3{width:210px;} +input.span4,textarea.span4,.uneditable-input.span4{width:290px;} +input.span5,textarea.span5,.uneditable-input.span5{width:370px;} +input.span6,textarea.span6,.uneditable-input.span6{width:450px;} +input.span7,textarea.span7,.uneditable-input.span7{width:530px;} +input.span8,textarea.span8,.uneditable-input.span8{width:610px;} +input.span9,textarea.span9,.uneditable-input.span9{width:690px;} +input.span10,textarea.span10,.uneditable-input.span10{width:770px;} +input.span11,textarea.span11,.uneditable-input.span11{width:850px;} +input.span12,textarea.span12,.uneditable-input.span12{width:930px;} +input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{background-color:#f5f5f5;border-color:#ddd;cursor:not-allowed;} +.control-group.warning>label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#c09853;} +.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#c09853;border-color:#c09853;}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#a47e3c;-webkit-box-shadow:0 0 6px #dbc59e;-moz-box-shadow:0 0 6px #dbc59e;box-shadow:0 0 6px #dbc59e;} +.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#c09853;background-color:#fcf8e3;border-color:#c09853;} +.control-group.error>label,.control-group.error .help-block,.control-group.error .help-inline{color:#b94a48;} +.control-group.error input,.control-group.error select,.control-group.error textarea{color:#b94a48;border-color:#b94a48;}.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#953b39;-webkit-box-shadow:0 0 6px #d59392;-moz-box-shadow:0 0 6px #d59392;box-shadow:0 0 6px #d59392;} +.control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#b94a48;background-color:#f2dede;border-color:#b94a48;} +.control-group.success>label,.control-group.success .help-block,.control-group.success .help-inline{color:#468847;} +.control-group.success input,.control-group.success select,.control-group.success textarea{color:#468847;border-color:#468847;}.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#356635;-webkit-box-shadow:0 0 6px #7aba7b;-moz-box-shadow:0 0 6px #7aba7b;box-shadow:0 0 6px #7aba7b;} +.control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#468847;background-color:#dff0d8;border-color:#468847;} +input:focus:required:invalid,textarea:focus:required:invalid,select:focus:required:invalid{color:#b94a48;border-color:#ee5f5b;}input:focus:required:invalid:focus,textarea:focus:required:invalid:focus,select:focus:required:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;} +.form-actions{padding:15px 20px 16px;margin-top:16px;margin-bottom:16px;background-color:#f5f5f5;border-top:1px solid #ddd;} +.uneditable-input{display:block;background-color:#ffffff;border-color:#eee;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);cursor:not-allowed;} +:-moz-placeholder{color:#999999;} +::-webkit-input-placeholder{color:#999999;} +.help-block{margin-top:5px;margin-bottom:0;color:#999999;} +.help-inline{display:inline-block;*display:inline;*zoom:1;margin-bottom:9px;vertical-align:middle;padding-left:5px;} +.input-prepend,.input-append{margin-bottom:5px;*zoom:1;}.input-prepend:before,.input-append:before,.input-prepend:after,.input-append:after{display:table;content:"";} +.input-prepend:after,.input-append:after{clear:both;} +.input-prepend input,.input-append input,.input-prepend .uneditable-input,.input-append .uneditable-input{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}.input-prepend input:focus,.input-append input:focus,.input-prepend .uneditable-input:focus,.input-append .uneditable-input:focus{position:relative;z-index:2;} +.input-prepend .uneditable-input,.input-append .uneditable-input{border-left-color:#ccc;} +.input-prepend .add-on,.input-append .add-on{float:left;display:block;width:auto;min-width:16px;height:16px;margin-right:-1px;padding:4px 5px;font-weight:normal;line-height:16px;color:#999999;text-align:center;text-shadow:0 1px 0 #ffffff;background-color:#f5f5f5;border:1px solid #ccc;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} +.input-prepend .active,.input-append .active{background-color:#a9dba9;border-color:#46a546;} +.input-prepend .add-on{*margin-top:1px;} +.input-append input,.input-append .uneditable-input{float:left;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} +.input-append .uneditable-input{border-right-color:#ccc;} +.input-append .add-on{margin-right:0;margin-left:-1px;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} +.input-append input:first-child{*margin-left:-160px;}.input-append input:first-child+.add-on{*margin-left:-21px;} +.search-query{padding-left:14px;padding-right:14px;margin-bottom:0;-webkit-border-radius:14px;-moz-border-radius:14px;border-radius:14px;} +.form-search input,.form-inline input,.form-horizontal input,.form-search textarea,.form-inline textarea,.form-horizontal textarea,.form-search select,.form-inline select,.form-horizontal select,.form-search .help-inline,.form-inline .help-inline,.form-horizontal .help-inline,.form-search .uneditable-input,.form-inline .uneditable-input,.form-horizontal .uneditable-input{display:inline-block;margin-bottom:0;} +.form-search label,.form-inline label,.form-search .input-append,.form-inline .input-append,.form-search .input-prepend,.form-inline .input-prepend{display:inline-block;} +.form-search .input-append .add-on,.form-inline .input-prepend .add-on,.form-search .input-append .add-on,.form-inline .input-prepend .add-on{vertical-align:middle;} +.control-group{margin-bottom:8px;} +.form-horizontal legend+.control-group{margin-top:16px;-webkit-margin-top-collapse:separate;} +.form-horizontal .control-group{margin-bottom:16px;*zoom:1;}.form-horizontal .control-group:before,.form-horizontal .control-group:after{display:table;content:"";} +.form-horizontal .control-group:after{clear:both;} +.form-horizontal .control-group>label{float:left;width:140px;padding-top:5px;text-align:right;} +.form-horizontal .controls{margin-left:160px;} +.form-horizontal .form-actions{padding-left:160px;} +table{max-width:100%;border-collapse:collapse;border-spacing:0;} +.table{width:100%;margin-bottom:16px;}.table th,.table td{padding:8px;line-height:16px;text-align:left;border-top:1px solid #ddd;} +.table th{font-weight:bold;vertical-align:bottom;} +.table td{vertical-align:top;} +.table thead:first-child tr th,.table thead:first-child tr td{border-top:0;} +.table tbody+tbody{border-top:2px solid #ddd;} +.table-condensed th,.table-condensed td{padding:4px 5px;} +.table-bordered{border:1px solid #ddd;border-collapse:separate;*border-collapse:collapsed;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.table-bordered th+th,.table-bordered td+td,.table-bordered th+td,.table-bordered td+th{border-left:1px solid #ddd;} +.table-bordered thead:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child td{border-top:0;} +.table-bordered thead:first-child tr:first-child th:first-child,.table-bordered tbody:first-child tr:first-child td:first-child{-webkit-border-radius:4px 0 0 0;-moz-border-radius:4px 0 0 0;border-radius:4px 0 0 0;} +.table-bordered thead:first-child tr:first-child th:last-child,.table-bordered tbody:first-child tr:first-child td:last-child{-webkit-border-radius:0 4px 0 0;-moz-border-radius:0 4px 0 0;border-radius:0 4px 0 0;} +.table-bordered thead:last-child tr:last-child th:first-child,.table-bordered tbody:last-child tr:last-child td:first-child{-webkit-border-radius:0 0 0 4px;-moz-border-radius:0 0 0 4px;border-radius:0 0 0 4px;} +.table-bordered thead:last-child tr:last-child th:last-child,.table-bordered tbody:last-child tr:last-child td:last-child{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} +.table-striped tbody tr:nth-child(odd) td,.table-striped tbody tr:nth-child(odd) th{background-color:#f9f9f9;} +table .span1{float:none;width:44px;margin-left:0;} +table .span2{float:none;width:124px;margin-left:0;} +table .span3{float:none;width:204px;margin-left:0;} +table .span4{float:none;width:284px;margin-left:0;} +table .span5{float:none;width:364px;margin-left:0;} +table .span6{float:none;width:444px;margin-left:0;} +table .span7{float:none;width:524px;margin-left:0;} +table .span8{float:none;width:604px;margin-left:0;} +table .span9{float:none;width:684px;margin-left:0;} +table .span10{float:none;width:764px;margin-left:0;} +table .span11{float:none;width:844px;margin-left:0;} +table .span12{float:none;width:924px;margin-left:0;} +[class^="icon-"]{display:inline-block;width:14px;height:14px;vertical-align:text-top;background-image:url(../img/glyphicons-halflings.png);background-position:14px 14px;background-repeat:no-repeat;*margin-right:.3em;}[class^="icon-"]:last-child{*margin-left:0;} +.icon-white{background-image:url(../img/glyphicons-halflings-white.png);} +.icon-glass{background-position:0 0;} +.icon-music{background-position:-24px 0;} +.icon-search{background-position:-48px 0;} +.icon-envelope{background-position:-72px 0;} +.icon-heart{background-position:-96px 0;} +.icon-star{background-position:-120px 0;} +.icon-star-empty{background-position:-144px 0;} +.icon-user{background-position:-168px 0;} +.icon-film{background-position:-192px 0;} +.icon-th-large{background-position:-216px 0;} +.icon-th{background-position:-240px 0;} +.icon-th-list{background-position:-264px 0;} +.icon-ok{background-position:-288px 0;} +.icon-remove{background-position:-312px 0;} +.icon-zoom-in{background-position:-336px 0;} +.icon-zoom-out{background-position:-360px 0;} +.icon-off{background-position:-384px 0;} +.icon-signal{background-position:-408px 0;} +.icon-cog{background-position:-432px 0;} +.icon-trash{background-position:-456px 0;} +.icon-home{background-position:0 -24px;} +.icon-file{background-position:-24px -24px;} +.icon-time{background-position:-48px -24px;} +.icon-road{background-position:-72px -24px;} +.icon-download-alt{background-position:-96px -24px;} +.icon-download{background-position:-120px -24px;} +.icon-upload{background-position:-144px -24px;} +.icon-inbox{background-position:-168px -24px;} +.icon-play-circle{background-position:-192px -24px;} +.icon-repeat{background-position:-216px -24px;} +.icon-refresh{background-position:-240px -24px;} +.icon-list-alt{background-position:-264px -24px;} +.icon-lock{background-position:-287px -24px;} +.icon-flag{background-position:-312px -24px;} +.icon-headphones{background-position:-336px -24px;} +.icon-volume-off{background-position:-360px -24px;} +.icon-volume-down{background-position:-384px -24px;} +.icon-volume-up{background-position:-408px -24px;} +.icon-qrcode{background-position:-432px -24px;} +.icon-barcode{background-position:-456px -24px;} +.icon-tag{background-position:0 -48px;} +.icon-tags{background-position:-25px -48px;} +.icon-book{background-position:-48px -48px;} +.icon-bookmark{background-position:-72px -48px;} +.icon-print{background-position:-96px -48px;} +.icon-camera{background-position:-120px -48px;} +.icon-font{background-position:-144px -48px;} +.icon-bold{background-position:-167px -48px;} +.icon-italic{background-position:-192px -48px;} +.icon-text-height{background-position:-216px -48px;} +.icon-text-width{background-position:-240px -48px;} +.icon-align-left{background-position:-264px -48px;} +.icon-align-center{background-position:-288px -48px;} +.icon-align-right{background-position:-312px -48px;} +.icon-align-justify{background-position:-336px -48px;} +.icon-list{background-position:-360px -48px;} +.icon-indent-left{background-position:-384px -48px;} +.icon-indent-right{background-position:-408px -48px;} +.icon-facetime-video{background-position:-432px -48px;} +.icon-picture{background-position:-456px -48px;} +.icon-pencil{background-position:0 -72px;} +.icon-map-marker{background-position:-24px -72px;} +.icon-adjust{background-position:-48px -72px;} +.icon-tint{background-position:-72px -72px;} +.icon-edit{background-position:-96px -72px;} +.icon-share{background-position:-120px -72px;} +.icon-check{background-position:-144px -72px;} +.icon-move{background-position:-168px -72px;} +.icon-step-backward{background-position:-192px -72px;} +.icon-fast-backward{background-position:-216px -72px;} +.icon-backward{background-position:-240px -72px;} +.icon-play{background-position:-264px -72px;} +.icon-pause{background-position:-288px -72px;} +.icon-stop{background-position:-312px -72px;} +.icon-forward{background-position:-336px -72px;} +.icon-fast-forward{background-position:-360px -72px;} +.icon-step-forward{background-position:-384px -72px;} +.icon-eject{background-position:-408px -72px;} +.icon-chevron-left{background-position:-432px -72px;} +.icon-chevron-right{background-position:-456px -72px;} +.icon-plus-sign{background-position:0 -96px;} +.icon-minus-sign{background-position:-24px -96px;} +.icon-remove-sign{background-position:-48px -96px;} +.icon-ok-sign{background-position:-72px -96px;} +.icon-question-sign{background-position:-96px -96px;} +.icon-info-sign{background-position:-120px -96px;} +.icon-screenshot{background-position:-144px -96px;} +.icon-remove-circle{background-position:-168px -96px;} +.icon-ok-circle{background-position:-192px -96px;} +.icon-ban-circle{background-position:-216px -96px;} +.icon-arrow-left{background-position:-240px -96px;} +.icon-arrow-right{background-position:-264px -96px;} +.icon-arrow-up{background-position:-289px -96px;} +.icon-arrow-down{background-position:-312px -96px;} +.icon-share-alt{background-position:-336px -96px;} +.icon-resize-full{background-position:-360px -96px;} +.icon-resize-small{background-position:-384px -96px;} +.icon-plus{background-position:-408px -96px;} +.icon-minus{background-position:-433px -96px;} +.icon-asterisk{background-position:-456px -96px;} +.icon-exclamation-sign{background-position:0 -120px;} +.icon-gift{background-position:-24px -120px;} +.icon-leaf{background-position:-48px -120px;} +.icon-fire{background-position:-72px -120px;} +.icon-eye-open{background-position:-96px -120px;} +.icon-eye-close{background-position:-120px -120px;} +.icon-warning-sign{background-position:-144px -120px;} +.icon-plane{background-position:-168px -120px;} +.icon-calendar{background-position:-192px -120px;} +.icon-random{background-position:-216px -120px;} +.icon-comment{background-position:-240px -120px;} +.icon-magnet{background-position:-264px -120px;} +.icon-chevron-up{background-position:-288px -120px;} +.icon-chevron-down{background-position:-313px -119px;} +.icon-retweet{background-position:-336px -120px;} +.icon-shopping-cart{background-position:-360px -120px;} +.icon-folder-close{background-position:-384px -120px;} +.icon-folder-open{background-position:-408px -120px;} +.icon-resize-vertical{background-position:-432px -119px;} +.icon-resize-horizontal{background-position:-456px -118px;} +.dropdown{position:relative;} +.dropdown-toggle{*margin-bottom:-3px;} +.dropdown-toggle:active,.open .dropdown-toggle{outline:0;} +.caret{display:inline-block;width:0;height:0;text-indent:-99999px;*text-indent:0;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #000000;opacity:0.3;filter:alpha(opacity=30);content:"\2193";} +.dropdown .caret{margin-top:8px;margin-left:2px;} +.dropdown:hover .caret,.open.dropdown .caret{opacity:1;filter:alpha(opacity=100);} +.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;float:left;display:none;min-width:160px;max-width:220px;_width:160px;padding:4px 0;margin:0;list-style:none;background-color:#ffffff;border-color:#ccc;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:1px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;*border-right-width:2px;*border-bottom-width:2px;}.dropdown-menu.bottom-up{top:auto;bottom:100%;margin-bottom:2px;} +.dropdown-menu .divider{height:1px;margin:5px 1px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;*width:100%;*margin:-5px 0 5px;} +.dropdown-menu a{display:block;padding:3px 15px;clear:both;font-weight:normal;line-height:18px;color:#555555;white-space:nowrap;} +.dropdown-menu li>a:hover,.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#ffffff;text-decoration:none;background-color:#0088cc;} +.dropdown.open{*z-index:1000;}.dropdown.open .dropdown-toggle{color:#ffffff;background:#ccc;background:rgba(0, 0, 0, 0.3);} +.dropdown.open .dropdown-menu{display:block;} +.typeahead{margin-top:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} +.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}.well blockquote{border-color:#ddd;border-color:rgba(0, 0, 0, 0.15);} +.fade{-webkit-transition:opacity 0.15s linear;-moz-transition:opacity 0.15s linear;-ms-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;opacity:0;}.fade.in{opacity:1;} +.collapse{-webkit-transition:height 0.35s ease;-moz-transition:height 0.35s ease;-ms-transition:height 0.35s ease;-o-transition:height 0.35s ease;transition:height 0.35s ease;position:relative;overflow:hidden;height:0;}.collapse.in{height:auto;} +.close{float:right;font-size:20px;font-weight:bold;line-height:16px;color:#000000;text-shadow:0 1px 0 #ffffff;opacity:0.2;filter:alpha(opacity=20);}.close:hover{color:#000000;text-decoration:none;opacity:0.4;filter:alpha(opacity=40);cursor:pointer;} +.btn{display:inline-block;padding:4px 10px 4px;font-size:12px;line-height:16px;color:#333333;text-align:center;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#fafafa;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;*margin-left:.3em;}.btn:first-child{*margin-left:0;} +.btn:hover{color:#333333;text-decoration:none;background-color:#e6e6e6;background-position:0 -15px;-webkit-transition:background-position 0.1s linear;-moz-transition:background-position 0.1s linear;-ms-transition:background-position 0.1s linear;-o-transition:background-position 0.1s linear;transition:background-position 0.1s linear;} +.btn:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;} +.btn.active,.btn:active{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);background-color:#e6e6e6;background-color:#d9d9d9 \9;color:rgba(0, 0, 0, 0.5);outline:0;} +.btn.disabled,.btn[disabled]{cursor:default;background-image:none;background-color:#e6e6e6;opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} +.btn-large{padding:9px 14px;font-size:14px;line-height:normal;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;} +.btn-large .icon{margin-top:1px;} +.btn-small{padding:5px 9px;font-size:10px;line-height:14px;} +.btn-small .icon{margin-top:-1px;} +.btn-primary,.btn-primary:hover,.btn-warning,.btn-warning:hover,.btn-danger,.btn-danger:hover,.btn-success,.btn-success:hover,.btn-info,.btn-info:hover{text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);color:#ffffff;} +.btn-primary.active,.btn-warning.active,.btn-danger.active,.btn-success.active,.btn-info.active{color:rgba(255, 255, 255, 0.75);} +.btn-primary{background-color:#006dcc;background-image:-moz-linear-gradient(top, #0088cc, #0044cc);background-image:-ms-linear-gradient(top, #0088cc, #0044cc);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));background-image:-webkit-linear-gradient(top, #0088cc, #0044cc);background-image:-o-linear-gradient(top, #0088cc, #0044cc);background-image:linear-gradient(top, #0088cc, #0044cc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);border-color:#0044cc #0044cc #002a80;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{background-color:#0044cc;} +.btn-primary:active,.btn-primary.active{background-color:#003399 \9;} +.btn-warning{background-color:#faa732;background-image:-moz-linear-gradient(top, #fbb450, #f89406);background-image:-ms-linear-gradient(top, #fbb450, #f89406);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));background-image:-webkit-linear-gradient(top, #fbb450, #f89406);background-image:-o-linear-gradient(top, #fbb450, #f89406);background-image:linear-gradient(top, #fbb450, #f89406);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0);border-color:#f89406 #f89406 #ad6704;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{background-color:#f89406;} +.btn-warning:active,.btn-warning.active{background-color:#c67605 \9;} +.btn-danger{background-color:#da4f49;background-image:-moz-linear-gradient(top, #ee5f5b, #bd362f);background-image:-ms-linear-gradient(top, #ee5f5b, #bd362f);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));background-image:-webkit-linear-gradient(top, #ee5f5b, #bd362f);background-image:-o-linear-gradient(top, #ee5f5b, #bd362f);background-image:linear-gradient(top, #ee5f5b, #bd362f);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0);border-color:#bd362f #bd362f #802420;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-danger:hover,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{background-color:#bd362f;} +.btn-danger:active,.btn-danger.active{background-color:#942a25 \9;} +.btn-success{background-color:#5bb75b;background-image:-moz-linear-gradient(top, #62c462, #51a351);background-image:-ms-linear-gradient(top, #62c462, #51a351);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351));background-image:-webkit-linear-gradient(top, #62c462, #51a351);background-image:-o-linear-gradient(top, #62c462, #51a351);background-image:linear-gradient(top, #62c462, #51a351);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0);border-color:#51a351 #51a351 #387038;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-success:hover,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{background-color:#51a351;} +.btn-success:active,.btn-success.active{background-color:#408140 \9;} +.btn-info{background-color:#49afcd;background-image:-moz-linear-gradient(top, #5bc0de, #2f96b4);background-image:-ms-linear-gradient(top, #5bc0de, #2f96b4);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4));background-image:-webkit-linear-gradient(top, #5bc0de, #2f96b4);background-image:-o-linear-gradient(top, #5bc0de, #2f96b4);background-image:linear-gradient(top, #5bc0de, #2f96b4);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0);border-color:#2f96b4 #2f96b4 #1f6377;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-info:hover,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{background-color:#2f96b4;} +.btn-info:active,.btn-info.active{background-color:#24748c \9;} +button.btn,input[type="submit"].btn{*padding-top:2px;*padding-bottom:2px;}button.btn::-moz-focus-inner,input[type="submit"].btn::-moz-focus-inner{padding:0;border:0;} +button.btn.large,input[type="submit"].btn.large{*padding-top:7px;*padding-bottom:7px;} +button.btn.small,input[type="submit"].btn.small{*padding-top:3px;*padding-bottom:3px;} +.btn-group{position:relative;*zoom:1;*margin-left:.3em;}.btn-group:before,.btn-group:after{display:table;content:"";} +.btn-group:after{clear:both;} +.btn-group:first-child{*margin-left:0;} +.btn-group+.btn-group{margin-left:5px;} +.btn-toolbar{margin-top:8px;margin-bottom:8px;}.btn-toolbar .btn-group{display:inline-block;*display:inline;*zoom:1;} +.btn-group .btn{position:relative;float:left;margin-left:-1px;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} +.btn-group .btn:first-child{margin-left:0;-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px;border-top-left-radius:4px;-webkit-border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px;border-bottom-left-radius:4px;} +.btn-group .btn:last-child,.btn-group .dropdown-toggle{-webkit-border-top-right-radius:4px;-moz-border-radius-topright:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px;border-bottom-right-radius:4px;} +.btn-group .btn.large:first-child{margin-left:0;-webkit-border-top-left-radius:6px;-moz-border-radius-topleft:6px;border-top-left-radius:6px;-webkit-border-bottom-left-radius:6px;-moz-border-radius-bottomleft:6px;border-bottom-left-radius:6px;} +.btn-group .btn.large:last-child,.btn-group .large.dropdown-toggle{-webkit-border-top-right-radius:6px;-moz-border-radius-topright:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;-moz-border-radius-bottomright:6px;border-bottom-right-radius:6px;} +.btn-group .btn:hover,.btn-group .btn:focus,.btn-group .btn:active,.btn-group .btn.active{z-index:2;} +.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0;} +.btn-group .dropdown-toggle{padding-left:8px;padding-right:8px;-webkit-box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);*padding-top:5px;*padding-bottom:5px;} +.btn-group.open{*z-index:1000;}.btn-group.open .dropdown-menu{display:block;margin-top:1px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;} +.btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);} +.btn .caret{margin-top:7px;margin-left:0;} +.btn:hover .caret,.open.btn-group .caret{opacity:1;filter:alpha(opacity=100);} +.btn-primary .caret,.btn-danger .caret,.btn-info .caret,.btn-success .caret{border-top-color:#ffffff;opacity:0.75;filter:alpha(opacity=75);} +.btn-small .caret{margin-top:4px;} +.alert{padding:8px 35px 8px 14px;margin-bottom:16px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#fcf8e3;border:1px solid #fbeed5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} +.alert,.alert-heading{color:#c09853;} +.alert .close{position:relative;top:-2px;right:-21px;line-height:18px;} +.alert-success{background-color:#dff0d8;border-color:#d6e9c6;} +.alert-success,.alert-success .alert-heading{color:#468847;} +.alert-danger,.alert-error{background-color:#f2dede;border-color:#eed3d7;} +.alert-danger,.alert-error,.alert-danger .alert-heading,.alert-error .alert-heading{color:#b94a48;} +.alert-info{background-color:#d9edf7;border-color:#bce8f1;} +.alert-info,.alert-info .alert-heading{color:#3a87ad;} +.alert-block{padding-top:14px;padding-bottom:14px;} +.alert-block>p,.alert-block>ul{margin-bottom:0;} +.alert-block p+p{margin-top:5px;} +.nav{margin-left:0;margin-bottom:16px;list-style:none;} +.nav>li>a{display:block;} +.nav>li>a:hover{text-decoration:none;background-color:#eeeeee;} +.nav-list{padding-left:14px;padding-right:14px;margin-bottom:0;} +.nav-list>li>a,.nav-list .nav-header{display:block;padding:3px 15px;margin-left:-15px;margin-right:-15px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);} +.nav-list .nav-header{font-size:11px;font-weight:bold;line-height:16px;color:#999999;text-transform:uppercase;} +.nav-list>li+.nav-header{margin-top:9px;} +.nav-list .active>a,.nav-list .active>a:hover{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.2);background-color:#0088cc;} +.nav-list [class^="icon-"]{margin-right:2px;} +.nav-tabs,.nav-pills{*zoom:1;}.nav-tabs:before,.nav-pills:before,.nav-tabs:after,.nav-pills:after{display:table;content:"";} +.nav-tabs:after,.nav-pills:after{clear:both;} +.nav-tabs>li,.nav-pills>li{float:left;} +.nav-tabs>li>a,.nav-pills>li>a{padding-right:12px;padding-left:12px;margin-right:2px;line-height:14px;} +.nav-tabs{border-bottom:1px solid #ddd;} +.nav-tabs>li{margin-bottom:-1px;} +.nav-tabs>li>a{padding-top:9px;padding-bottom:9px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.nav-tabs>li>a:hover{border-color:#eeeeee #eeeeee #dddddd;} +.nav-tabs>.active>a,.nav-tabs>.active>a:hover{color:#555555;background-color:#ffffff;border:1px solid #ddd;border-bottom-color:transparent;cursor:default;} +.nav-pills>li>a{padding-top:8px;padding-bottom:8px;margin-top:2px;margin-bottom:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;} +.nav-pills .active>a,.nav-pills .active>a:hover{color:#ffffff;background-color:#0088cc;} +.nav-stacked>li{float:none;} +.nav-stacked>li>a{margin-right:0;} +.nav-tabs.nav-stacked{border-bottom:0;} +.nav-tabs.nav-stacked>li>a{border:1px solid #ddd;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} +.nav-tabs.nav-stacked>li:first-child>a{-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;} +.nav-tabs.nav-stacked>li:last-child>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;} +.nav-tabs.nav-stacked>li>a:hover{border-color:#ddd;z-index:2;} +.nav-pills.nav-stacked>li>a{margin-bottom:3px;} +.nav-pills.nav-stacked>li:last-child>a{margin-bottom:1px;} +.nav-tabs .dropdown-menu,.nav-pills .dropdown-menu{margin-top:1px;border-width:1px;} +.nav-pills .dropdown-menu{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} +.nav-tabs .dropdown-toggle .caret,.nav-pills .dropdown-toggle .caret{border-top-color:#0088cc;margin-top:6px;} +.nav-tabs .dropdown-toggle:hover .caret,.nav-pills .dropdown-toggle:hover .caret{border-top-color:#005580;} +.nav-tabs .active .dropdown-toggle .caret,.nav-pills .active .dropdown-toggle .caret{border-top-color:#333333;} +.nav>.dropdown.active>a:hover{color:#000000;cursor:pointer;} +.nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>.open.active>a:hover{color:#ffffff;background-color:#999999;border-color:#999999;} +.nav .open .caret,.nav .open.active .caret,.nav .open a:hover .caret{border-top-color:#ffffff;opacity:1;filter:alpha(opacity=100);} +.tabs-stacked .open>a:hover{border-color:#999999;} +.tabbable{*zoom:1;}.tabbable:before,.tabbable:after{display:table;content:"";} +.tabbable:after{clear:both;} +.tabs-below .nav-tabs,.tabs-right .nav-tabs,.tabs-left .nav-tabs{border-bottom:0;} +.tab-content>.tab-pane,.pill-content>.pill-pane{display:none;} +.tab-content>.active,.pill-content>.active{display:block;} +.tabs-below .nav-tabs{border-top:1px solid #ddd;} +.tabs-below .nav-tabs>li{margin-top:-1px;margin-bottom:0;} +.tabs-below .nav-tabs>li>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}.tabs-below .nav-tabs>li>a:hover{border-bottom-color:transparent;border-top-color:#ddd;} +.tabs-below .nav-tabs .active>a,.tabs-below .nav-tabs .active>a:hover{border-color:transparent #ddd #ddd #ddd;} +.tabs-left .nav-tabs>li,.tabs-right .nav-tabs>li{float:none;} +.tabs-left .nav-tabs>li>a,.tabs-right .nav-tabs>li>a{min-width:74px;margin-right:0;margin-bottom:3px;} +.tabs-left .nav-tabs{float:left;margin-right:19px;border-right:1px solid #ddd;} +.tabs-left .nav-tabs>li>a{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px;} +.tabs-left .nav-tabs>li>a:hover{border-color:#eeeeee #dddddd #eeeeee #eeeeee;} +.tabs-left .nav-tabs .active>a,.tabs-left .nav-tabs .active>a:hover{border-color:#ddd transparent #ddd #ddd;*border-right-color:#ffffff;} +.tabs-right .nav-tabs{float:right;margin-left:19px;border-left:1px solid #ddd;} +.tabs-right .nav-tabs>li>a{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0;} +.tabs-right .nav-tabs>li>a:hover{border-color:#eeeeee #eeeeee #eeeeee #dddddd;} +.tabs-right .nav-tabs .active>a,.tabs-right .nav-tabs .active>a:hover{border-color:#ddd #ddd #ddd transparent;*border-left-color:#ffffff;} +.navbar{overflow:visible;margin-bottom:16px;} +.navbar-inner{padding-left:20px;padding-right:20px;background-color:#303239;background-image:-moz-linear-gradient(top, #333333, #2c3143);background-image:-ms-linear-gradient(top, #333333, #2c3143);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#2c3143));background-image:-webkit-linear-gradient(top, #333333, #2c3143);background-image:-o-linear-gradient(top, #333333, #2c3143);background-image:linear-gradient(top, #333333, #2c3143);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#2c3143', GradientType=0);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);} +.btn-navbar{display:none;float:right;padding:7px 10px;margin-left:5px;margin-right:5px;background-color:#303239;background-image:-moz-linear-gradient(top, #333333, #2c3143);background-image:-ms-linear-gradient(top, #333333, #2c3143);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#2c3143));background-image:-webkit-linear-gradient(top, #333333, #2c3143);background-image:-o-linear-gradient(top, #333333, #2c3143);background-image:linear-gradient(top, #333333, #2c3143);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#2c3143', GradientType=0);border-color:#2c3143 #2c3143 #0e0f15;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.075);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.075);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.075);}.btn-navbar:hover,.btn-navbar:active,.btn-navbar.active,.btn-navbar.disabled,.btn-navbar[disabled]{background-color:#2c3143;} +.btn-navbar:active,.btn-navbar.active{background-color:#181a24 \9;} +.btn-navbar .icon-bar{display:block;width:18px;height:2px;background-color:#f5f5f5;-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;-webkit-box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);-moz-box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);} +.btn-navbar .icon-bar+.icon-bar{margin-top:3px;} +.nav-collapse.collapse{height:auto;} +.navbar .brand:hover{text-decoration:none;} +.navbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;font-size:20px;font-weight:200;line-height:1;color:#ffffff;} +.navbar .navbar-text{margin-bottom:0;line-height:40px;color:#999999;}.navbar .navbar-text a:hover{color:#ffffff;background-color:transparent;} +.navbar .btn,.navbar .btn-group{margin-top:5px;} +.navbar .btn-group .btn{margin-top:0;} +.navbar-form{margin-bottom:0;*zoom:1;}.navbar-form:before,.navbar-form:after{display:table;content:"";} +.navbar-form:after{clear:both;} +.navbar-form input,.navbar-form select{display:inline-block;margin-top:5px;margin-bottom:0;} +.navbar-form .radio,.navbar-form .checkbox{margin-top:5px;} +.navbar-form input[type="image"],.navbar-form input[type="checkbox"],.navbar-form input[type="radio"]{margin-top:3px;} +.navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;color:rgba(255, 255, 255, 0.75);background:#666;background:rgba(255, 255, 255, 0.3);border:1px solid #111;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query :-moz-placeholder{color:#eeeeee;} +.navbar-search .search-query::-webkit-input-placeholder{color:#eeeeee;} +.navbar-search .search-query:hover{color:#ffffff;background-color:#999999;background-color:rgba(255, 255, 255, 0.5);} +.navbar-search .search-query:focus,.navbar-search .search-query.focused{padding:5px 10px;color:#333333;text-shadow:0 1px 0 #ffffff;background-color:#ffffff;border:0;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);outline:0;} +.navbar-fixed-top{position:fixed;top:0;right:0;left:0;z-index:1030;} +.navbar-fixed-top .navbar-inner{padding-left:0;padding-right:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} +.navbar .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0;} +.navbar .nav.pull-right{float:right;} +.navbar .nav>li{display:block;float:left;} +.navbar .nav>li>a{float:none;padding:10px 10px 11px;line-height:19px;color:#999999;text-decoration:none;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} +.navbar .nav>li>a:hover{background-color:transparent;color:#ffffff;text-decoration:none;} +.navbar .nav .active>a,.navbar .nav .active>a:hover{color:#ffffff;text-decoration:none;background-color:#2c3143;background-color:rgba(0, 0, 0, 0.5);} +.navbar .divider-vertical{height:32px;width:1px;margin:0 9px;overflow:hidden;background-color:#2c3143;border-right:1px solid #333333;} +.navbar .nav.pull-right{margin-left:10px;margin-right:0;} +.navbar .dropdown-menu{margin-top:1px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.navbar .dropdown-menu:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0, 0, 0, 0.2);position:absolute;top:-7px;left:9px;} +.navbar .dropdown-menu:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #ffffff;position:absolute;top:-6px;left:10px;} +.navbar .nav .dropdown-toggle .caret,.navbar .nav .open.dropdown .caret{border-top-color:#ffffff;} +.navbar .nav .active .caret{opacity:1;filter:alpha(opacity=100);} +.navbar .nav .open>.dropdown-toggle,.navbar .nav .active>.dropdown-toggle,.navbar .nav .open.active>.dropdown-toggle{background-color:transparent;} +.navbar .nav .active>.dropdown-toggle:hover{color:#ffffff;} +.navbar .nav.pull-right .dropdown-menu{left:auto;right:0;}.navbar .nav.pull-right .dropdown-menu:before{left:auto;right:12px;} +.navbar .nav.pull-right .dropdown-menu:after{left:auto;right:13px;} +.breadcrumb{padding:7px 14px;margin:0 0 16px;background-color:#fbfbfb;background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline;text-shadow:0 1px 0 #ffffff;} +.breadcrumb .divider{padding:0 5px;color:#999999;} +.breadcrumb .active a{color:#333333;} +.pagination{height:32px;margin:16px 0;} +.pagination ul{display:inline-block;*display:inline;*zoom:1;margin-left:0;margin-bottom:0;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);} +.pagination li{display:inline;} +.pagination a{float:left;padding:0 14px;line-height:30px;text-decoration:none;border:1px solid #ddd;border-left-width:0;} +.pagination a:hover,.pagination .active a{background-color:#f5f5f5;} +.pagination .active a{color:#999999;cursor:default;} +.pagination .disabled a,.pagination .disabled a:hover{color:#999999;background-color:transparent;cursor:default;} +.pagination li:first-child a{border-left-width:1px;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} +.pagination li:last-child a{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} +.pagination-centered{text-align:center;} +.pagination-right{text-align:right;} +.pager{margin-left:0;margin-bottom:16px;list-style:none;text-align:center;*zoom:1;}.pager:before,.pager:after{display:table;content:"";} +.pager:after{clear:both;} +.pager li{display:inline;} +.pager a{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;} +.pager a:hover{text-decoration:none;background-color:#f5f5f5;} +.pager .next a{float:right;} +.pager .previous a{float:left;} +.modal-open .dropdown-menu{z-index:2050;} +.modal-open .dropdown.open{*z-index:2050;} +.modal-open .popover{z-index:2060;} +.modal-open .tooltip{z-index:2070;} +.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000000;}.modal-backdrop.fade{opacity:0;} +.modal-backdrop,.modal-backdrop.fade.in{opacity:0.8;filter:alpha(opacity=80);} +.modal{position:fixed;top:50%;left:50%;z-index:1050;max-height:500px;overflow:auto;width:560px;margin:-250px 0 0 -280px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.modal.fade{-webkit-transition:opacity .3s linear, top .3s ease-out;-moz-transition:opacity .3s linear, top .3s ease-out;-ms-transition:opacity .3s linear, top .3s ease-out;-o-transition:opacity .3s linear, top .3s ease-out;transition:opacity .3s linear, top .3s ease-out;top:-25%;} +.modal.fade.in{top:50%;} +.modal-header{padding:9px 15px;border-bottom:1px solid #eee;}.modal-header .close{margin-top:2px;} +.modal-body{padding:15px;} +.modal-footer{padding:14px 15px 15px;margin-bottom:0;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;*zoom:1;}.modal-footer:before,.modal-footer:after{display:table;content:"";} +.modal-footer:after{clear:both;} +.modal-footer .btn{float:right;margin-left:5px;margin-bottom:0;} +.tooltip{position:absolute;z-index:1020;display:block;visibility:visible;padding:5px;font-size:11px;opacity:0;filter:alpha(opacity=0);}.tooltip.in{opacity:0.8;filter:alpha(opacity=80);} +.tooltip.top{margin-top:-2px;} +.tooltip.right{margin-left:2px;} +.tooltip.bottom{margin-top:2px;} +.tooltip.left{margin-left:-2px;} +.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;} +.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;} +.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;} +.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;} +.tooltip-inner{max-width:200px;padding:3px 8px;color:#ffffff;text-align:center;text-decoration:none;background-color:#000000;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} +.tooltip-arrow{position:absolute;width:0;height:0;} +.popover{position:absolute;top:0;left:0;z-index:1010;display:none;padding:5px;}.popover.top{margin-top:-5px;} +.popover.right{margin-left:5px;} +.popover.bottom{margin-top:5px;} +.popover.left{margin-left:-5px;} +.popover.top .arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;} +.popover.right .arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;} +.popover.bottom .arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;} +.popover.left .arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;} +.popover .arrow{position:absolute;width:0;height:0;} +.popover-inner{padding:3px;width:280px;overflow:hidden;background:#000000;background:rgba(0, 0, 0, 0.8);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);} +.popover-title{padding:9px 15px;line-height:1;background-color:#f5f5f5;border-bottom:1px solid #eee;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;} +.popover-content{padding:14px;background-color:#ffffff;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover-content p,.popover-content ul,.popover-content ol{margin-bottom:0;} +.thumbnails{margin-left:-20px;list-style:none;*zoom:1;}.thumbnails:before,.thumbnails:after{display:table;content:"";} +.thumbnails:after{clear:both;} +.thumbnails>li{float:left;margin:0 0 16px 20px;} +.thumbnail{display:block;padding:4px;line-height:1;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);} +a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);} +.thumbnail>img{display:block;max-width:100%;margin-left:auto;margin-right:auto;} +.thumbnail .caption{padding:9px;} +.label{padding:1px 3px 2px;font-size:9px;font-weight:bold;color:#ffffff;text-transform:uppercase;background-color:#999999;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +.label-important{background-color:#b94a48;} +.label-warning{background-color:#f89406;} +.label-success{background-color:#468847;} +.label-info{background-color:#3a87ad;} +@-webkit-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@-moz-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}.progress{overflow:hidden;height:18px;margin-bottom:18px;background-color:#f7f7f7;background-image:-moz-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-ms-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));background-image:-webkit-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-o-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:linear-gradient(top, #f5f5f5, #f9f9f9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} +.progress .bar{width:0%;height:18px;color:#ffffff;font-size:12px;text-align:center;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0e90d2;background-image:-moz-linear-gradient(top, #149bdf, #0480be);background-image:-ms-linear-gradient(top, #149bdf, #0480be);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));background-image:-webkit-linear-gradient(top, #149bdf, #0480be);background-image:-o-linear-gradient(top, #149bdf, #0480be);background-image:linear-gradient(top, #149bdf, #0480be);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width 0.6s ease;-moz-transition:width 0.6s ease;-ms-transition:width 0.6s ease;-o-transition:width 0.6s ease;transition:width 0.6s ease;} +.progress-striped .bar{background-color:#62c462;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px;} +.progress.active .bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite;} +.progress-danger .bar{background-color:#dd514c;background-image:-moz-linear-gradient(top, #ee5f5b, #c43c35);background-image:-ms-linear-gradient(top, #ee5f5b, #c43c35);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));background-image:-webkit-linear-gradient(top, #ee5f5b, #c43c35);background-image:-o-linear-gradient(top, #ee5f5b, #c43c35);background-image:linear-gradient(top, #ee5f5b, #c43c35);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);} +.progress-danger.progress-striped .bar{background-color:#ee5f5b;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} +.progress-success .bar{background-color:#5eb95e;background-image:-moz-linear-gradient(top, #62c462, #57a957);background-image:-ms-linear-gradient(top, #62c462, #57a957);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));background-image:-webkit-linear-gradient(top, #62c462, #57a957);background-image:-o-linear-gradient(top, #62c462, #57a957);background-image:linear-gradient(top, #62c462, #57a957);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);} +.progress-success.progress-striped .bar{background-color:#62c462;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} +.progress-info .bar{background-color:#4bb1cf;background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-ms-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(top, #5bc0de, #339bb9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);} +.progress-info.progress-striped .bar{background-color:#5bc0de;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} +.accordion{margin-bottom:16px;} +.accordion-group{margin-bottom:2px;border:1px solid #e5e5e5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} +.accordion-heading{border-bottom:0;} +.accordion-heading .accordion-toggle{display:block;padding:8px 15px;} +.accordion-inner{padding:9px 15px;border-top:1px solid #e5e5e5;} +.carousel{position:relative;margin-bottom:16px;line-height:1;} +.carousel-inner{overflow:hidden;width:100%;position:relative;} +.carousel .item{display:none;position:relative;-webkit-transition:0.6s ease-in-out left;-moz-transition:0.6s ease-in-out left;-ms-transition:0.6s ease-in-out left;-o-transition:0.6s ease-in-out left;transition:0.6s ease-in-out left;} +.carousel .item>img{display:block;line-height:1;} +.carousel .active,.carousel .next,.carousel .prev{display:block;} +.carousel .active{left:0;} +.carousel .next,.carousel .prev{position:absolute;top:0;width:100%;} +.carousel .next{left:100%;} +.carousel .prev{left:-100%;} +.carousel .next.left,.carousel .prev.right{left:0;} +.carousel .active.left{left:-100%;} +.carousel .active.right{left:100%;} +.carousel-control{position:absolute;top:40%;left:15px;width:40px;height:40px;margin-top:-20px;font-size:60px;font-weight:100;line-height:30px;color:#ffffff;text-align:center;background:#222222;border:3px solid #ffffff;-webkit-border-radius:23px;-moz-border-radius:23px;border-radius:23px;opacity:0.5;filter:alpha(opacity=50);}.carousel-control.right{left:auto;right:15px;} +.carousel-control:hover{color:#ffffff;text-decoration:none;opacity:0.9;filter:alpha(opacity=90);} +.carousel-caption{position:absolute;left:0;right:0;bottom:0;padding:10px 15px 5px;background:#333333;background:rgba(0, 0, 0, 0.75);} +.carousel-caption h4,.carousel-caption p{color:#ffffff;} +.hero-unit{padding:60px;margin-bottom:30px;background-color:#f5f5f5;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;} +.hero-unit p{font-size:18px;font-weight:200;line-height:24px;} +.pull-right{float:right;} +.pull-left{float:left;} +.hide{display:none;} +.show{display:block;} +.invisible{visibility:hidden;} +body{background:#eeeeee;} +.unselectable{user-select:none;-moz-user-select:none;-webkit-user-select:none;} +#background{position:absolute;background:#eeeeee;z-index:-1;top:0;left:0;margin:0;padding:0;width:100%;height:100%;} +#messagebox{position:absolute;top:33px;left:0;width:100%;height:24px !important;overflow:hidden;border-bottom:solid #999 1px;font-size:90%;} +#left,#left-border,#center,#right-border,#right{position:absolute;top:39px;bottom:0px;overflow:hidden;background:#fff;} +#left,#center,#right{border-top:solid #999999 1px;} +#left-border,#right-border{background:#eeeeee;border-left:solid #999999 1px;border-right:solid #999999 1px;padding-right:1px;padding-left:1px;width:5px;z-index:10000;} +#left-border div,#right-border div{width:100%;height:100%;background-repeat:no-repeat;background-position:center center;position:absolute;width:5px;height:100%;} +#left-border div,#right-border.hidden div{background-image:url(tiny_arrow_left.png);cursor:w-resize;} +#left-border.hidden div,#right-border div{background-image:url(tiny_arrow_right.png);cursor:e-resize;} +#left-border.hover div,#right-border.hover div{background-color:#aaaaee;} +#left{left:0px;width:250px;z-index:200;} +#left-border{left:250px;} +#center{left:259px;right:259px;overflow:hidden;z-index:1;} +#right-border{right:250px;} +#right{width:250px;right:0px;z-index:200;} +.unified-panel-header{height:2em;z-index:1000;background:#cccccc;background-image:url(panel_header_bg.png);background-position:top center;background-repeat:repeat-x;border-bottom:solid #999999 1px;margin:0;padding:0;padding-right:10px;padding-left:10px;color:#333;font-weight:bold;} +.unified-panel-header-inner{padding-top:0.45em;} +.menu-bg{background:#c1c9e5 url(menu_bg.png) top repeat-x;} +div.unified-panel-body{position:absolute;top:2em;bottom:0;width:100%;margin-top:1px;} +.panel-header-button{color:#333;text-decoration:none;display:inline-block;cursor:pointer;margin:-1px;padding:1px;margin-top:-0.2em;border:solid #999 1px;padding-right:0.5em;padding-left:0.5em;-moz-border-radius:0.5em;-webkit-border-radius:0.5em;border-radius:0.5em;} +.panel-header-button.popup{padding-right:1.75em;background:url(../images/dropdownarrow.png) no-repeat right 7px;} +.panel-header-button:hover{color:black;background-color:#ccc;} +.panel-header-button:active{color:white;background-color:#aaaaaa;} +#overlay{position:fixed;top:0;left:0;width:100%;height:100%;z-index:20000;} +#overlay.modal #overlay-background{background:rgba(0, 0, 0, 0.5);} +.dialog-box-container{position:relative;margin-top:80px;margin-right:auto;margin-left:auto;} +.dialog-box-wrapper{position:relative;padding:1em;background-color:rgba(0, 0, 0, 0.5);-moz-border-radius:1em;-webkit-border-radius:1em;} +.dialog-box{border:solid #999 1px;background:white;z-index:80000;} +#overlay.modal .dialog-box .body{min-width:600px;} +.dialog-box .body{padding:5px;overflow:auto;max-height:500px;min-width:300px;} +.dialog-box .buttons{padding:5px;} +.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;} +.panel-done-message{background-image:url(done_small.png);background-color:#ccffcc;} +.panel-info-message{background-image:url(info_small.png);background-color:#ccccff;} +#masthead{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;overflow:visible;margin-bottom:16px;position:absolute;top:0;left:0;width:100%;min-width:900px;height:32px;border-bottom:solid #444444 1px;z-index:15000;padding:0;}#masthead .brand:hover{text-decoration:none;} +#masthead .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;font-size:20px;font-weight:200;line-height:1;color:#ffffff;} +#masthead .navbar-text{margin-bottom:0;line-height:40px;color:#999999;}#masthead .navbar-text a:hover{color:#ffffff;background-color:transparent;} +#masthead .btn,#masthead .btn-group{margin-top:5px;} +#masthead .btn-group .btn{margin-top:0;} +#masthead a{color:#eeeeee;text-decoration:none;} +#masthead .title{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;font-size:20px;font-weight:200;line-height:1;color:#ffffff;font-family:verdana;z-index:2000;} +#masthead .masthead-inner{padding-left:20px;padding-right:20px;background-color:#303239;background-image:-moz-linear-gradient(top, #333333, #2c3143);background-image:-ms-linear-gradient(top, #333333, #2c3143);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#2c3143));background-image:-webkit-linear-gradient(top, #333333, #2c3143);background-image:-o-linear-gradient(top, #333333, #2c3143);background-image:linear-gradient(top, #333333, #2c3143);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#2c3143', GradientType=0);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);height:32px;} +#masthead .tab-group{margin:0;padding:0 10px;height:100%;white-space:nowrap;cursor:default;background:transparent;}#masthead .tab-group .tab{position:relative;float:left;margin:0;padding:0 1em;height:32px;line-height:32px;text-align:left;}#masthead .tab-group .tab .submenu{display:none;position:absolute;z-index:16000;left:0;top:32px;padding:1em;margin:-1em;padding-top:0;margin-top:0;background-color:rgba(0, 0, 0, 0.5);-moz-border-radius:0 0 1em 1em;-webkit-border-bottom-right-radius:1em;-webkit-border-bottom-left-radius:1em;}#masthead .tab-group .tab .submenu ul{display:block;margin:0;padding:0;list-style-type:none;background:#2c3143;}#masthead .tab-group .tab .submenu ul li{display:block;padding:0 1em;white-space:nowrap;} +#masthead .tab-group .tab:hover>a{color:gold !important;} +#masthead .tab-group .active{background:#010101;} +#masthead a:hover{text-decoration:underline;} +.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:#c1c9e5;} +.quota-meter-bar{position:absolute;top:0;left:0;height:16px;background-color:#969db3;} +.quota-meter-bar-warn{background-color:#ffb400;} +.quota-meter-bar-error{background-color:#ff4343;} +.quota-meter-text{position:absolute;top:50%;left:0;width:100px;height:16px;margin-top:-6px;text-align:center;z-index:9001;color:#000000;} diff -r b1dac5a9b1d7d01a9e55940a4546fc5ed6f79bd0 -r fca74f9562024605dd87a3a6ace02d28a1851f5e static/june_2007_style/galaxy_bootstrap.less --- /dev/null +++ b/static/june_2007_style/galaxy_bootstrap.less @@ -0,0 +1,146 @@ +// Variables.less +// Variables to customize the look and feel of Bootstrap +// ----------------------------------------------------- + +// GLOBAL VALUES +// -------------------------------------------------- + +// Links +@linkColor: #08c; +@linkColorHover: darken(@linkColor, 15%); + +// Grays +@black: #000; +@grayDarker: #222; +@grayDark: #333; +@gray: #555; +@grayLight: #999; +@grayLighter: #eee; +@white: #fff; + +// Accent colors +@blue: #049cdb; +@blueDark: #0064cd; +@green: #46a546; +@red: #9d261d; +@yellow: #ffc40d; +@orange: #f89406; +@pink: #c3325f; +@purple: #7a43b6; + +// Typography +@baseFontSize: 12px; +@baseFontFamily: "Lucida Grande",verdana,arial,helvetica,sans-serif; +@baseLineHeight: 16px; +@textColor: @grayDark; + +// Buttons +@primaryButtonBackground: @linkColor; + + + +// COMPONENT VARIABLES +// -------------------------------------------------- + +// Z-index master list +// Used for a bird's eye view of components dependent on the z-axis +// Try to avoid customizing these :) +@zindexDropdown: 1000; +@zindexPopover: 1010; +@zindexTooltip: 1020; +@zindexFixedNavbar: 1030; +@zindexModalBackdrop: 1040; +@zindexModal: 1050; + +// Input placeholder text color +@placeholderText: @grayLight; + +// Navbar +@navbarHeight: 32px; +@navbarBackground: @masthead_bg; +@navbarBackgroundHighlight: @grayDark; + +@navbarText: @grayLight; +@navbarLinkColor: @grayLight; +@navbarLinkColorHover: @white; + +// Form states and alerts +@warningText: #c09853; +@warningBackground: #fcf8e3; +@warningBorder: darken(spin(@warningBackground, -10), 3%); + +@errorText: #b94a48; +@errorBackground: #f2dede; +@errorBorder: darken(spin(@errorBackground, -10), 3%); + +@successText: #468847; +@successBackground: #dff0d8; +@successBorder: darken(spin(@successBackground, -10), 5%); + +@infoText: #3a87ad; +@infoBackground: #d9edf7; +@infoBorder: darken(spin(@infoBackground, -10), 7%); + + + +// GRID +// -------------------------------------------------- + +// Default 940px grid +@gridColumns: 12; +@gridColumnWidth: 60px; +@gridGutterWidth: 20px; +@gridRowWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1)); + +// Fluid grid +@fluidGridColumnWidth: 6.382978723%; +@fluidGridGutterWidth: 2.127659574%; + +// ---- Imports ---- + +@import "bootstrap/reset.less"; +@import "bootstrap/mixins.less"; + +// Grid system and page structure +@import "bootstrap/scaffolding.less"; + +// Base CSS +@import "bootstrap/type.less"; +@import "bootstrap/code.less"; +@import "bootstrap/forms.less"; +@import "bootstrap/tables.less"; + +// Components: common +@import "bootstrap/sprites.less"; +@import "bootstrap/dropdowns.less"; +@import "bootstrap/wells.less"; +@import "bootstrap/component-animations.less"; +@import "bootstrap/close.less"; + +// Components: Buttons & Alerts +@import "bootstrap/buttons.less"; +@import "bootstrap/button-groups.less"; +@import "bootstrap/alerts.less"; // Note: alerts share common CSS with buttons and thus have styles in buttons.less + +// Components: Nav +@import "bootstrap/navs.less"; +@import "bootstrap/navbar.less"; +@import "bootstrap/breadcrumbs.less"; +@import "bootstrap/pagination.less"; +@import "bootstrap/pager.less"; + +// Components: Popovers +@import "bootstrap/modals.less"; +@import "bootstrap/tooltip.less"; +@import "bootstrap/popovers.less"; + +// Components: Misc +@import "bootstrap/thumbnails.less"; +@import "bootstrap/labels.less"; +@import "bootstrap/progress-bars.less"; +@import "bootstrap/accordion.less"; +@import "bootstrap/carousel.less"; +@import "bootstrap/hero-unit.less"; + +// Utility classes +@import "bootstrap/utilities.less"; \ No newline at end of file diff -r b1dac5a9b1d7d01a9e55940a4546fc5ed6f79bd0 -r fca74f9562024605dd87a3a6ace02d28a1851f5e static/june_2007_style/make_style.py --- a/static/june_2007_style/make_style.py +++ b/static/june_2007_style/make_style.py @@ -18,16 +18,6 @@ def run( cmd ): return Popen( cmd, stdout=PIPE).communicate()[0] -templates = [ ( "base.css.tmpl", "base.css" ), - ( "panel_layout.css.tmpl", "panel_layout.css" ), - ( "masthead.css.tmpl", "masthead.css" ), - ( "library.css.tmpl", "library.css" ), - ( "history.css.tmpl", "history.css" ), - ( "tool_menu.css.tmpl", "tool_menu.css" ), - ( "iphone.css.tmpl", "iphone.css" ), - ( "autocomplete_tagging.css.tmpl", "autocomplete_tagging.css" ), - ( "trackster.css.tmpl", "trackster.css" ) ] - # TODO: Are these images still being used? If not, clean this code up! images = [ ( "./gradient.py 9 30 $panel_header_bg_top - $panel_header_bg_bottom 0 0 $panel_header_bg_bottom 1 1", "panel_header_bg.png" ), @@ -62,6 +52,10 @@ ] if __name__ == "__main__": + print "This script is no longer used for generating stylesheets. Please use the Makefile instead" + + # Old code for processing stylesheets + """ if len(sys.argv) > 1: # has params ini_file, out_dir = sys.argv[1:] else: @@ -71,8 +65,9 @@ for in_file, out_file in templates: print in_file ,"->", out_file subprocess.call( "./process_css.py %s shared_images:../images %s < %s > %s" % ( ini_file, out_dir, in_file, os.path.join( out_dir, out_file ) ), shell=True ) - + """ +# Old code for processing images, long disabled, though images are still used. """ for rule, output in images: t = string.Template( rule ).substitute( context ) diff -r b1dac5a9b1d7d01a9e55940a4546fc5ed6f79bd0 -r fca74f9562024605dd87a3a6ace02d28a1851f5e static/june_2007_style/panel_layout.css.tmpl --- a/static/june_2007_style/panel_layout.css.tmpl +++ /dev/null @@ -1,383 +0,0 @@ -body { - font: 75% "Lucida Grande",verdana,arial,helvetica,sans-serif; - background: ${layout_bg}; -} - -.unselectable { - user-select: none; - -moz-user-select: none; - -webkit-user-select: none; -} - -#background { - position: absolute; - background: ${layout_bg}; - z-index: -1; - top: 0; - left: 0; - margin: 0; - padding: 0; - width: 100%; - height: 100%; -} - -#messagebox { - position:absolute; - top:33px; - left:0; - width:100%; - height:24px !important; - overflow: hidden; - border-bottom: solid #999 1px; - font-size: 90%; -} - -#left, #left-border, #center, #right-border, #right { - position: absolute; - top: 39px; - bottom: 0px; - overflow: hidden; - background: #fff; -} -#left, #center, #right { - border-top: solid ${layout_border} 1px; -} -#left-border, #right-border { - background: #eeeeee; - border-left: solid ${layout_border} 1px; - border-right: solid ${layout_border} 1px; - padding-right: 1px; - padding-left: 1px; - width: 5px; - z-index: 10000; } -#left-border div, #right-border div { - width: 100%; - height: 100%; - background-repeat: no-repeat; - background-position: center center; - position: absolute; - width: 5px; - height: 100%; -} -#left-border div, #right-border.hidden div { - background-image: url(tiny_arrow_left.png); - cursor: w-resize; -} -#left-border.hidden div, #right-border div { - background-image: url(tiny_arrow_right.png); - cursor: e-resize; -} -#left-border.hover div, #right-border.hover div { - background-color: ${layout_hover}; -} -#left { - left: 0px; - width: 250px; - z-index: 200; -} -#left-border { - left: 250px; -} -#center { - left:259px; - right: 259px; - overflow: hidden; - z-index: 1; -} -#right-border { - right: 250px; -} -#right { - width: 250px; - right: 0px; - z-index: 200; -} - -.unified-panel-header { - height: 2em; - z-index: 1000; - background: ${panel_header_bg_bottom}; - background-image: url(panel_header_bg.png); - background-position: top center; - background-repeat: repeat-x; - border-bottom: solid ${layout_border} 1px; - margin: 0; - padding: 0; - padding-right: 10px; - padding-left: 10px; - color: #333; - font-weight: bold; -} - -.unified-panel-header-inner { - padding-top: 0.45em; -} - -.menu-bg { - background: $menu_bg_over url(menu_bg.png) top repeat-x; -} - -div.unified-panel-body { - position: absolute; - top: 2em; - bottom: 0; - width: 100%; - margin-top: 1px; -} - -.panel-header-button { - color: #333; - text-decoration: none; - display: inline-block; - cursor: pointer; - margin: -1px; padding: 1px; - margin-top: -0.2em; - border: solid #999 1px; - padding-right: 0.5em; - padding-left: 0.5em; - -moz-border-radius: 0.5em; - -webkit-border-radius: 0.5em; - border-radius: 0.5em; -} - -.panel-header-button.popup { - padding-right: 1.75em; - background: url(../images/dropdownarrow.png) no-repeat right 7px; -} - -.panel-header-button:hover { - color: black; - background-color: #ccc; -} - -.panel-header-button:active { - color: white; - background-color: #aaaaaa; -} - -#overlay { - position: fixed; - top: 0; left: 0; width: 100%; height: 100%; - z-index: 20000; -} - -#overlay.modal #overlay-background { - background: rgba(0,0,0,0.5); -} - -.dialog-box-container { - position: relative; - margin-top: 80px; - margin-right: auto; - margin-left: auto; -} - -.dialog-box-wrapper { - position: relative; - padding: 1em; - background-color: rgba(0,0,0,0.5); - -moz-border-radius: 1em; - -webkit-border-radius: 1em; -} - -.dialog-box { - border: solid #999 1px; - background: white; - z-index: 80000; -} - -#overlay.modal .dialog-box .body { - min-width: 600px; -} - -.dialog-box .body { - padding: 5px; - overflow: auto; - max-height: 500px; - min-width: 300px; -} - -.dialog-box .buttons { - padding: 5px; -} - -## Messages for message box, slightly different style - -.panel-error-message, .panel-warning-message, .panel-done-message, .panel-info-message -{ - height: 24px; - line-height: 24px; - color: $base_text; - padding: 0px; - padding-left: 26px; - background-color: $error_message_bg; - 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: $warn_message_bg; -} - -.panel-done-message -{ - background-image: url(done_small.png); - background-color: $done_message_bg; -} - -.panel-info-message -{ - background-image: url(info_small.png); - background-color: $info_message_bg; -} - -## Masthead - -#masthead { - position:absolute; - top:0; - left:0; - width:100%; - min-width:900px; - height:32px; - background: ${masthead_bg}; - color:#fff; - border-bottom: solid ${layout_masthead_border} 1px; - z-index: 15000; - padding: 0; - - a { - color: ${masthead_link}; - text-decoration: none; - } - - .title { - font-family: verdana; - padding: 3px 10px; - font-size: 175%; - font-weight: bold; - z-index: -1; - } -} - -#masthead a:hover { - text-decoration: underline; -} - -.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: $quota_meter_bg; -} - -.quota-meter-bar -{ - position: absolute; - top: 0; - left: 0; - height: 16px; - background-color: $quota_meter_bar; -} - -.quota-meter-bar-warn -{ - background-color: $quota_meter_warn_bar; -} - -.quota-meter-bar-error -{ - background-color: $quota_meter_error_bar; -} - -.quota-meter-text -{ - position: absolute; - top: 50%; - left: 0; - width: 100px; - height: 16px; - margin-top: -6px; - text-align: center; - z-index: 9001; - color: $quota_meter_text; -} - -## Tabs - -.tab-group { - - margin: 0; - padding: 0 10px; - height: 100%; - white-space: nowrap; - cursor: default; - background: transparent; - - .tab { - - background: ${masthead_bg}; - position: relative; - float: left; - margin: 0; - padding: 0 1em; - height: 32px; - line-height: 32px; - text-align: left; - - .submenu { - - display: none; - position: absolute; - z-index: 16000; - left: 0; - top: 32px; - padding: 1em; - margin: -1em; - padding-top: 0; - margin-top: 0; - background-color: rgba(0,0,0,0.5); - -moz-border-radius: 0 0 1em 1em; - -webkit-border-bottom-right-radius: 1em; - -webkit-border-bottom-left-radius: 1em; - - ul { - - display: block; - margin: 0; - padding: 0; - list-style-type: none; - background: ${masthead_bg}; - - li { - - display: block; - padding: 0 1em; - white-space: nowrap; - } - } - } - } - - .tab:hover > a { - color: gold !important; - } - - .active { - background: rgb(1,1,1); - } -} diff -r b1dac5a9b1d7d01a9e55940a4546fc5ed6f79bd0 -r fca74f9562024605dd87a3a6ace02d28a1851f5e static/june_2007_style/panel_layout.less --- /dev/null +++ b/static/june_2007_style/panel_layout.less @@ -0,0 +1,395 @@ +@import "variables"; + +@import "galaxy_bootstrap.less"; + +body { + // font: 75% "Lucida Grande",verdana,arial,helvetica,sans-serif; + background: @layout_bg; +} + +.unselectable { + user-select: none; + -moz-user-select: none; + -webkit-user-select: none; +} + +#background { + position: absolute; + background: @layout_bg; + z-index: -1; + top: 0; + left: 0; + margin: 0; + padding: 0; + width: 100%; + height: 100%; +} + +#messagebox { + position:absolute; + top:33px; + left:0; + width:100%; + height:24px !important; + overflow: hidden; + border-bottom: solid #999 1px; + font-size: 90%; +} + +#left, #left-border, #center, #right-border, #right { + position: absolute; + top: 39px; + bottom: 0px; + overflow: hidden; + background: #fff; +} +#left, #center, #right { + border-top: solid @layout_border 1px; +} +#left-border, #right-border { + background: #eeeeee; + border-left: solid @layout_border 1px; + border-right: solid @layout_border 1px; + padding-right: 1px; + padding-left: 1px; + width: 5px; + z-index: 10000; } +#left-border div, #right-border div { + width: 100%; + height: 100%; + background-repeat: no-repeat; + background-position: center center; + position: absolute; + width: 5px; + height: 100%; +} +#left-border div, #right-border.hidden div { + background-image: url(tiny_arrow_left.png); + cursor: w-resize; +} +#left-border.hidden div, #right-border div { + background-image: url(tiny_arrow_right.png); + cursor: e-resize; +} +#left-border.hover div, #right-border.hover div { + background-color: @layout_hover; +} +#left { + left: 0px; + width: 250px; + z-index: 200; +} +#left-border { + left: 250px; +} +#center { + left:259px; + right: 259px; + overflow: hidden; + z-index: 1; +} +#right-border { + right: 250px; +} +#right { + width: 250px; + right: 0px; + z-index: 200; +} + +.unified-panel-header { + height: 2em; + z-index: 1000; + background: @panel_header_bg_bottom; + background-image: url(panel_header_bg.png); + background-position: top center; + background-repeat: repeat-x; + border-bottom: solid @layout_border 1px; + margin: 0; + padding: 0; + padding-right: 10px; + padding-left: 10px; + color: #333; + font-weight: bold; +} + +.unified-panel-header-inner { + padding-top: 0.45em; +} + +.menu-bg { + background: @menu_bg_over url(menu_bg.png) top repeat-x; +} + +div.unified-panel-body { + position: absolute; + top: 2em; + bottom: 0; + width: 100%; + margin-top: 1px; +} + +.panel-header-button { + color: #333; + text-decoration: none; + display: inline-block; + cursor: pointer; + margin: -1px; padding: 1px; + margin-top: -0.2em; + border: solid #999 1px; + padding-right: 0.5em; + padding-left: 0.5em; + -moz-border-radius: 0.5em; + -webkit-border-radius: 0.5em; + border-radius: 0.5em; +} + +.panel-header-button.popup { + padding-right: 1.75em; + background: url(../images/dropdownarrow.png) no-repeat right 7px; +} + +.panel-header-button:hover { + color: black; + background-color: #ccc; +} + +.panel-header-button:active { + color: white; + background-color: #aaaaaa; +} + +#overlay { + position: fixed; + top: 0; left: 0; width: 100%; height: 100%; + z-index: 20000; +} + +#overlay.modal #overlay-background { + background: rgba(0,0,0,0.5); +} + +.dialog-box-container { + position: relative; + margin-top: 80px; + margin-right: auto; + margin-left: auto; +} + +.dialog-box-wrapper { + position: relative; + padding: 1em; + background-color: rgba(0,0,0,0.5); + -moz-border-radius: 1em; + -webkit-border-radius: 1em; +} + +.dialog-box { + border: solid #999 1px; + background: white; + z-index: 80000; +} + +#overlay.modal .dialog-box .body { + min-width: 600px; +} + +.dialog-box .body { + padding: 5px; + overflow: auto; + max-height: 500px; + min-width: 300px; +} + +.dialog-box .buttons { + padding: 5px; +} + +// Messages for message box, slightly different style + +.panel-error-message, .panel-warning-message, .panel-done-message, .panel-info-message +{ + height: 24px; + line-height: 24px; + color: @base_text; + padding: 0px; + padding-left: 26px; + background-color: @error_message_bg; + 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: @warn_message_bg; +} + +.panel-done-message +{ + background-image: url(done_small.png); + background-color: @done_message_bg; +} + +.panel-info-message +{ + background-image: url(info_small.png); + background-color: @info_message_bg; +} + +// Masthead + +#masthead { + .border-radius(0); + .navbar(); + position:absolute; + top:0; + left:0; + width:100%; + min-width:900px; + height:32px; + // background: @masthead_bg; + // color:#fff; + border-bottom: solid @layout_masthead_border 1px; + z-index: 15000; + padding: 0; + + a { + color: @masthead_link; + text-decoration: none; + } + + .title { + .navbar.brand(); + font-family: verdana; + //padding: 3px 10px; + //font-size: 175%; + //font-weight: bold; + z-index: 2000; + } + + .masthead-inner { + .navbar-inner(); + height: 32px; + } + + // Tabs + + .tab-group { + + margin: 0; + padding: 0 10px; + height: 100%; + white-space: nowrap; + cursor: default; + background: transparent; + + .tab { + + // background: @masthead_bg; + position: relative; + float: left; + margin: 0; + padding: 0 1em; + height: 32px; + line-height: 32px; + text-align: left; + + .submenu { + + display: none; + position: absolute; + z-index: 16000; + left: 0; + top: 32px; + padding: 1em; + margin: -1em; + padding-top: 0; + margin-top: 0; + background-color: rgba(0,0,0,0.5); + -moz-border-radius: 0 0 1em 1em; + -webkit-border-bottom-right-radius: 1em; + -webkit-border-bottom-left-radius: 1em; + + ul { + + display: block; + margin: 0; + padding: 0; + list-style-type: none; + background: @masthead_bg; + + li { + + display: block; + padding: 0 1em; + white-space: nowrap; + } + } + } + } + + .tab:hover > a { + color: gold !important; + } + + .active { + background: rgb(1,1,1); + } + } +} + +#masthead a:hover { + text-decoration: underline; +} + +.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: @quota_meter_bg; +} + +.quota-meter-bar +{ + position: absolute; + top: 0; + left: 0; + height: 16px; + background-color: @quota_meter_bar; +} + +.quota-meter-bar-warn +{ + background-color: @quota_meter_warn_bar; +} + +.quota-meter-bar-error +{ + background-color: @quota_meter_error_bar; +} + +.quota-meter-text +{ + position: absolute; + top: 50%; + left: 0; + width: 100px; + height: 16px; + margin-top: -6px; + text-align: center; + z-index: 9001; + color: @quota_meter_text; +} diff -r b1dac5a9b1d7d01a9e55940a4546fc5ed6f79bd0 -r fca74f9562024605dd87a3a6ace02d28a1851f5e static/june_2007_style/variables_to_less.py --- /dev/null +++ b/static/june_2007_style/variables_to_less.py @@ -0,0 +1,23 @@ +#!/usr/bin/env python + +""" +Read ini-like variable definition and output in less format. +""" + +import sys + +def main(): + # Read variable definitions from a (sorta) ini file + context = dict() + for line in sys.stdin: + if line.startswith( '#' ): + continue + key, value = line.rstrip("\r\n").split( '=' ) + if value.startswith( '"' ) and value.endswith( '"' ): + value = value[1:-1] + if value == "-": + continue + print "@%s: %s;" % ( key, value ) + +if __name__ == "__main__": + main() diff -r b1dac5a9b1d7d01a9e55940a4546fc5ed6f79bd0 -r fca74f9562024605dd87a3a6ace02d28a1851f5e templates/base_panels.mako --- a/templates/base_panels.mako +++ b/templates/base_panels.mako @@ -217,8 +217,10 @@ ## Background displays first <div id="background"></div> ## Layer iframes over backgrounds - <div id="masthead"> - ${self.masthead()} + <div id="masthead" class="navbar nabbar-fixed-top"> + <div class="masthead-inner navbar-inner"> + <div class="container">${self.masthead()}</div> + </div></div><div id="messagebox" class="panel-${self.message_box_class}-message"> %if self.message_box_visible: https://bitbucket.org/galaxy/galaxy-central/changeset/691da36cb16e/ changeset: 691da36cb16e user: james_taylor date: 2012-02-23 17:41:36 summary: style: new styles for panels, rewrite panel javascript. normalizing styles for popups. add iconic icon font. various other style tweaks. affected #: 25 files Diff too large to display. https://bitbucket.org/galaxy/galaxy-central/changeset/31b3f926d928/ changeset: 31b3f926d928 user: james_taylor date: 2012-02-23 19:16:54 summary: style: don't import bootstrap tooltips, conflicts with our use of that class. fix panels for viz view. affected #: 6 files diff -r 691da36cb16e533af00dfaf72c69bd878c58384d -r 31b3f926d9284eee0331245b3be5299c0f7d9dd1 static/june_2007_style/base.less --- a/static/june_2007_style/base.less +++ b/static/june_2007_style/base.less @@ -16,6 +16,10 @@ // ==== Real (basic) styles ==== +.clear { + .clearfix(); +} + body { background: @base_bg_bottom; color: @base_text; @@ -236,11 +240,15 @@ div.unified-panel-body { position: absolute; top: @panel_header_height; - bottom: @panel_footer_height; + bottom: 0; width: 100%; margin-top: 1px; } +#left > div.unified-panel-body, #right > div.unified-panel-body { + bottom: @panel_footer_height; +} + .panel-header-button { color: #333; text-decoration: none; @@ -251,27 +259,20 @@ // border: solid #999 1px; padding-right: 0.5em; padding-left: 0.5em; - // -moz-border-radius: 0.5em; - // -webkit-border-radius: 0.5em; - // border-radius: 0.5em; + // Fade to maroon on hover + &:hover { + color: maroon; + .transition(color .25s linear); + } + // Bootstrap style span caret needs positioning .caret { margin-top: 7px; } -} - -.panel-header-button.popup { - padding-right: 1.75em; - background: url(../images/dropdownarrow.png) no-repeat right 7px; -} - -.panel-header-button:hover { - // color: black; - // background-color: #ccc; -} - -.panel-header-button:active { - // color: white; - // background-color: #aaaaaa; + // Another way to get a caret + &.popup { + padding-right: 1.75em; + background: url(../images/dropdownarrow.png) no-repeat right 7px; + } } #overlay { @@ -695,6 +696,8 @@ } .infomessagelarge { + .alert(); + .alert-info(); background-image: url(info_message_icon.png); border-color: @info_message_border; background-color: @info_message_bg; @@ -1327,7 +1330,7 @@ // Default history item appearance div.historyItem { - margin: 5px -5px 5px 0px; + margin: -5px -5px 5px 0px; padding: 5px 11px 5px 5px; border: solid @history_queued_border 1px; border-left: solid @history_queued_border 5px; diff -r 691da36cb16e533af00dfaf72c69bd878c58384d -r 31b3f926d9284eee0331245b3be5299c0f7d9dd1 static/june_2007_style/blue/base.css --- a/static/june_2007_style/blue/base.css +++ b/static/june_2007_style/blue/base.css @@ -279,17 +279,6 @@ .modal-footer{padding:14px 15px 15px;margin-bottom:0;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;*zoom:1;}.modal-footer:before,.modal-footer:after{display:table;content:"";} .modal-footer:after{clear:both;} .modal-footer .btn{float:right;margin-left:5px;margin-bottom:0;} -.tooltip{position:absolute;z-index:1020;display:block;visibility:visible;padding:5px;font-size:11px;opacity:0;filter:alpha(opacity=0);}.tooltip.in{opacity:0.8;filter:alpha(opacity=80);} -.tooltip.top{margin-top:-2px;} -.tooltip.right{margin-left:2px;} -.tooltip.bottom{margin-top:2px;} -.tooltip.left{margin-left:-2px;} -.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;} -.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;} -.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;} -.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;} -.tooltip-inner{max-width:200px;padding:3px 8px;color:#ffffff;text-align:center;text-decoration:none;background-color:#000000;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} -.tooltip-arrow{position:absolute;width:0;height:0;} .popover{position:absolute;top:0;left:0;z-index:1010;display:none;padding:5px;}.popover.top{margin-top:-5px;} .popover.right{margin-left:5px;} .popover.bottom{margin-top:5px;} @@ -341,158 +330,160 @@ .show{display:block;} .invisible{visibility:hidden;} @font-face{font-family:'IconicStroke';src:url('../images/fonts/iconic_stroke.eot');src:url('../images/fonts/iconic_stroke.eot?#iefix') format('embedded-opentype'),url('../images/fonts/iconic_stroke.ttf') format('truetype'),url('../images/fonts/iconic_stroke.svg#iconic') format('svg');font-weight:normal;font-style:normal;}.iconic{display:inline-block;font-family:'IconicStroke';} -.lightbulb:before{content:'\e063';} -.equalizer:before{content:'\e052';} -.map_pin_stroke:before{content:'\e068';} -.brush_alt:before{content:'\e01c';} -.move:before{content:'\e03e';} -.pen_alt_stroke:before{content:'\e005';} -.move_vertical:before{content:'\e03b';} -.book_alt2:before{content:'\e06a';} -.layers:before{content:'\e01f';} -.pause:before{content:'\e049';} -.layers_alt:before{content:'\e020';} -.cloud_upload:before{content:'\e045';} -.chart_alt:before{content:'\e029';} -.fullscreen_exit_alt:before{content:'\e051';} -.cloud_download:before{content:'\e044';} -.comment_alt2_stroke:before{content:'\e004';} -.mail:before{content:'\2709';} -.check_alt:before{content:'\2718';} -.document_stroke:before{content:'\e066';} -.battery_charging:before{content:'\e05d';} -.stop:before{content:'\e04a';} -.arrow_up:before{content:'\2191';} -.move_horizontal:before{content:'\e038';} -.compass:before{content:'\e021';} -.minus_alt:before{content:'\e009';} -.battery_empty:before{content:'\e05c';} -.map_pin_alt:before{content:'\e002';} -.unlock_stroke:before{content:'\e076';} -.lock_stroke:before{content:'\e075';} -.question_mark:before{content:'\003f';} -.list:before{content:'\e055';} -.upload:before{content:'\e043';} -.reload:before{content:'\e030';} -.loop_alt4:before{content:'\e035';} -.loop_alt3:before{content:'\e034';} -.loop_alt2:before{content:'\e033';} -.loop_alt1:before{content:'\e032';} -.left_quote:before{content:'\275d';} -.x:before{content:'\2713';} -.last:before{content:'\e04d';} -.document_alt_stroke:before{content:'\e000';} -.bars:before{content:'\e06f';} -.arrow_left:before{content:'\2190';} -.arrow_down:before{content:'\2193';} -.download:before{content:'\e042';} -.home:before{content:'\2302';} -.calendar:before{content:'\e001';} -.right_quote_alt:before{content:'\e012';} -.fullscreen:before{content:'\e04e';} -.dial:before{content:'\e058';} -.plus_alt:before{content:'\e008';} -.clock:before{content:'\e079';} -.movie:before{content:'\e060';} -.steering_wheel:before{content:'\e024';} -.pen:before{content:'\270e';} -.tag_stroke:before{content:'\e02b';} -.pin:before{content:'\e067';} -.denied:before{content:'\26d4';} -.left_quote_alt:before{content:'\e011';} -.volume_mute:before{content:'\e071';} -.arrow_up_alt2:before{content:'\e018';} -.list_nested:before{content:'\e056';} -.arrow_up_alt1:before{content:'\e014';} -.comment_stroke:before{content:'\e06d';} -.undo:before{content:'\e02f';} -.umbrella:before{content:'\2602';} -.bolt:before{content:'\26a1';} -.article:before{content:'\e053';} -.read_more:before{content:'\e054';} -.beaker:before{content:'\e023';} -.beaker_alt:before{content:'\e010';} -.battery_full:before{content:'\e073';} -.arrow_right:before{content:'\2192';} -.new_window:before{content:'\e059';} -.plus:before{content:'\2795';} -.cog:before{content:'\2699';} -.key_stroke:before{content:'\26bf';} -.first:before{content:'\e04c';} -.comment_alt1_stroke:before{content:'\e003';} -.trash_stroke:before{content:'\e05a';} -.image:before{content:'\e027';} -.chat_alt_stroke:before{content:'\e007';} -.cd:before{content:'\e064';} -.right_quote:before{content:'\275e';} -.brush:before{content:'\e01b';} -.cloud:before{content:'\2601';} -.eye:before{content:'\e025';} -.play_alt:before{content:'\e048';} -.transfer:before{content:'\e041';} -.pen_alt2:before{content:'\e006';} -.camera:before{content:'\e070';} -.move_horizontal_alt2:before{content:'\e03a';} -.curved_arrow:before{content:'\2935';} -.move_horizontal_alt1:before{content:'\e039';} -.aperture:before{content:'\e026';} -.reload_alt:before{content:'\e031';} -.magnifying_glass:before{content:'\e074';} -.iphone:before{content:'\e06e';} -.fork:before{content:'\e046';} -.box:before{content:'\e06b';} -.bars_alt:before{content:'\e00a';} -.heart_stroke:before{content:'\2764';} -.volume:before{content:'\e072';} -.x_alt:before{content:'\2714';} -.link:before{content:'\e077';} -.moon_stroke:before{content:'\263e';} -.eyedropper:before{content:'\e01e';} -.spin:before{content:'\e036';} -.rss:before{content:'\e02c';} -.info:before{content:'\2139';} -.target:before{content:'\e02a';} -.cursor:before{content:'\e057';} -.minus:before{content:'\2796';} -.book_alt:before{content:'\e00b';} -.headphones:before{content:'\e061';} -.hash:before{content:'\0023';} -.arrow_left_alt1:before{content:'\e013';} -.arrow_left_alt2:before{content:'\e017';} -.fullscreen_exit:before{content:'\e050';} -.share:before{content:'\e02e';} -.fullscreen_alt:before{content:'\e04f';} -.at:before{content:'\0040';} -.chat:before{content:'\e05e';} -.move_vertical_alt2:before{content:'\e03d';} -.move_vertical_alt1:before{content:'\e03c';} -.check:before{content:'\2717';} -.mic:before{content:'\e05f';} -.calendar_alt_stroke:before{content:'\e06c';} -.book:before{content:'\e069';} -.move_alt1:before{content:'\e03f';} -.move_alt2:before{content:'\e040';} -.award_stroke:before{content:'\e022';} -.wrench:before{content:'\e078';} -.play:before{content:'\e047';} -.star:before{content:'\2605';} -.chart:before{content:'\e028';} -.rain:before{content:'\26c6';} -.folder_stroke:before{content:'\e065';} -.sun_stroke:before{content:'\2600';} -.user:before{content:'\e062';} -.battery_half:before{content:'\e05b';} -.aperture_alt:before{content:'\e00c';} -.eject:before{content:'\e04b';} -.arrow_down_alt1:before{content:'\e016';} -.pilcrow:before{content:'\00b6';} -.arrow_down_alt2:before{content:'\e01a';} -.arrow_right_alt1:before{content:'\e015';} -.arrow_right_alt2:before{content:'\e019';} -.rss_alt:before{content:'\e02d';} -.spin_alt:before{content:'\e037';} +.iconic.lightbulb:before{content:'\e063';} +.iconic.equalizer:before{content:'\e052';} +.iconic.map_pin_stroke:before{content:'\e068';} +.iconic.brush_alt:before{content:'\e01c';} +.iconic.move:before{content:'\e03e';} +.iconic.pen_alt_stroke:before{content:'\e005';} +.iconic.move_vertical:before{content:'\e03b';} +.iconic.book_alt2:before{content:'\e06a';} +.iconic.layers:before{content:'\e01f';} +.iconic.pause:before{content:'\e049';} +.iconic.layers_alt:before{content:'\e020';} +.iconic.cloud_upload:before{content:'\e045';} +.iconic.chart_alt:before{content:'\e029';} +.iconic.fullscreen_exit_alt:before{content:'\e051';} +.iconic.cloud_download:before{content:'\e044';} +.iconic.comment_alt2_stroke:before{content:'\e004';} +.iconic.mail:before{content:'\2709';} +.iconic.check_alt:before{content:'\2718';} +.iconic.document_stroke:before{content:'\e066';} +.iconic.battery_charging:before{content:'\e05d';} +.iconic.stop:before{content:'\e04a';} +.iconic.arrow_up:before{content:'\2191';} +.iconic.move_horizontal:before{content:'\e038';} +.iconic.compass:before{content:'\e021';} +.iconic.minus_alt:before{content:'\e009';} +.iconic.battery_empty:before{content:'\e05c';} +.iconic.map_pin_alt:before{content:'\e002';} +.iconic.unlock_stroke:before{content:'\e076';} +.iconic.lock_stroke:before{content:'\e075';} +.iconic.question_mark:before{content:'\003f';} +.iconic.list:before{content:'\e055';} +.iconic.upload:before{content:'\e043';} +.iconic.reload:before{content:'\e030';} +.iconic.loop_alt4:before{content:'\e035';} +.iconic.loop_alt3:before{content:'\e034';} +.iconic.loop_alt2:before{content:'\e033';} +.iconic.loop_alt1:before{content:'\e032';} +.iconic.left_quote:before{content:'\275d';} +.iconic.x:before{content:'\2713';} +.iconic.last:before{content:'\e04d';} +.iconic.document_alt_stroke:before{content:'\e000';} +.iconic.bars:before{content:'\e06f';} +.iconic.arrow_left:before{content:'\2190';} +.iconic.arrow_down:before{content:'\2193';} +.iconic.download:before{content:'\e042';} +.iconic.home:before{content:'\2302';} +.iconic.calendar:before{content:'\e001';} +.iconic.right_quote_alt:before{content:'\e012';} +.iconic.fullscreen:before{content:'\e04e';} +.iconic.dial:before{content:'\e058';} +.iconic.plus_alt:before{content:'\e008';} +.iconic.clock:before{content:'\e079';} +.iconic.movie:before{content:'\e060';} +.iconic.steering_wheel:before{content:'\e024';} +.iconic.pen:before{content:'\270e';} +.iconic.tag_stroke:before{content:'\e02b';} +.iconic.pin:before{content:'\e067';} +.iconic.denied:before{content:'\26d4';} +.iconic.left_quote_alt:before{content:'\e011';} +.iconic.volume_mute:before{content:'\e071';} +.iconic.arrow_up_alt2:before{content:'\e018';} +.iconic.list_nested:before{content:'\e056';} +.iconic.arrow_up_alt1:before{content:'\e014';} +.iconic.comment_stroke:before{content:'\e06d';} +.iconic.undo:before{content:'\e02f';} +.iconic.umbrella:before{content:'\2602';} +.iconic.bolt:before{content:'\26a1';} +.iconic.article:before{content:'\e053';} +.iconic.read_more:before{content:'\e054';} +.iconic.beaker:before{content:'\e023';} +.iconic.beaker_alt:before{content:'\e010';} +.iconic.battery_full:before{content:'\e073';} +.iconic.arrow_right:before{content:'\2192';} +.iconic.new_window:before{content:'\e059';} +.iconic.plus:before{content:'\2795';} +.iconic.cog:before{content:'\2699';} +.iconic.key_stroke:before{content:'\26bf';} +.iconic.first:before{content:'\e04c';} +.iconic.comment_alt1_stroke:before{content:'\e003';} +.iconic.trash_stroke:before{content:'\e05a';} +.iconic.image:before{content:'\e027';} +.iconic.chat_alt_stroke:before{content:'\e007';} +.iconic.cd:before{content:'\e064';} +.iconic.right_quote:before{content:'\275e';} +.iconic.brush:before{content:'\e01b';} +.iconic.cloud:before{content:'\2601';} +.iconic.eye:before{content:'\e025';} +.iconic.play_alt:before{content:'\e048';} +.iconic.transfer:before{content:'\e041';} +.iconic.pen_alt2:before{content:'\e006';} +.iconic.camera:before{content:'\e070';} +.iconic.move_horizontal_alt2:before{content:'\e03a';} +.iconic.curved_arrow:before{content:'\2935';} +.iconic.move_horizontal_alt1:before{content:'\e039';} +.iconic.aperture:before{content:'\e026';} +.iconic.reload_alt:before{content:'\e031';} +.iconic.magnifying_glass:before{content:'\e074';} +.iconic.iphone:before{content:'\e06e';} +.iconic.fork:before{content:'\e046';} +.iconic.box:before{content:'\e06b';} +.iconic.bars_alt:before{content:'\e00a';} +.iconic.heart_stroke:before{content:'\2764';} +.iconic.volume:before{content:'\e072';} +.iconic.x_alt:before{content:'\2714';} +.iconic.link:before{content:'\e077';} +.iconic.moon_stroke:before{content:'\263e';} +.iconic.eyedropper:before{content:'\e01e';} +.iconic.spin:before{content:'\e036';} +.iconic.rss:before{content:'\e02c';} +.iconic.info:before{content:'\2139';} +.iconic.target:before{content:'\e02a';} +.iconic.cursor:before{content:'\e057';} +.iconic.minus:before{content:'\2796';} +.iconic.book_alt:before{content:'\e00b';} +.iconic.headphones:before{content:'\e061';} +.iconic.hash:before{content:'\0023';} +.iconic.arrow_left_alt1:before{content:'\e013';} +.iconic.arrow_left_alt2:before{content:'\e017';} +.iconic.fullscreen_exit:before{content:'\e050';} +.iconic.share:before{content:'\e02e';} +.iconic.fullscreen_alt:before{content:'\e04f';} +.iconic.at:before{content:'\0040';} +.iconic.chat:before{content:'\e05e';} +.iconic.move_vertical_alt2:before{content:'\e03d';} +.iconic.move_vertical_alt1:before{content:'\e03c';} +.iconic.check:before{content:'\2717';} +.iconic.mic:before{content:'\e05f';} +.iconic.calendar_alt_stroke:before{content:'\e06c';} +.iconic.book:before{content:'\e069';} +.iconic.move_alt1:before{content:'\e03f';} +.iconic.move_alt2:before{content:'\e040';} +.iconic.award_stroke:before{content:'\e022';} +.iconic.wrench:before{content:'\e078';} +.iconic.play:before{content:'\e047';} +.iconic.star:before{content:'\2605';} +.iconic.chart:before{content:'\e028';} +.iconic.rain:before{content:'\26c6';} +.iconic.folder_stroke:before{content:'\e065';} +.iconic.sun_stroke:before{content:'\2600';} +.iconic.user:before{content:'\e062';} +.iconic.battery_half:before{content:'\e05b';} +.iconic.aperture_alt:before{content:'\e00c';} +.iconic.eject:before{content:'\e04b';} +.iconic.arrow_down_alt1:before{content:'\e016';} +.iconic.pilcrow:before{content:'\00b6';} +.iconic.arrow_down_alt2:before{content:'\e01a';} +.iconic.arrow_right_alt1:before{content:'\e015';} +.iconic.arrow_right_alt2:before{content:'\e019';} +.iconic.rss_alt:before{content:'\e02d';} +.iconic.spin_alt:before{content:'\e037';} .unselectable{-webkit-user-select:none;-moz-user-select:none;-o-user-select:none;user-select:none;} .shadow{-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25);} +.clear{*zoom:1;}.clear:before,.clear:after{display:table;content:"";} +.clear:after{clear:both;} body{background:#ffffff;color:#303030;background-image:url(base_bg.png);background-repeat:repeat-x;background-position:top;margin:10px;} img{border:0;} a:link,a:visited,a:active{text-decoration:underline;color:#303030;} @@ -522,8 +513,10 @@ #right>.unified-panel-footer .collapse:before{content:'\2192';} #right>.unified-panel-footer .collapse.hidden:before{content:'\2190';} .menu-bg{background:whiteSmoke top repeat-x;} -div.unified-panel-body{position:absolute;top:30px;bottom:25px;width:100%;margin-top:1px;} -.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 .caret{margin-top:7px;} +div.unified-panel-body{position:absolute;top:30px;bottom:0;width:100%;margin-top:1px;} +#left>div.unified-panel-body,#right>div.unified-panel-body{bottom:25px;} +.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;-ms-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.modal #overlay-background{background:rgba(0, 0, 0, 0.5);} @@ -591,7 +584,7 @@ .errormessagelarge{background-color:#f2dede;border-color:#eed3d7;color:#b94a48;padding-left:52px;} .warningmessagelarge{padding:8px 35px 8px 14px;margin-bottom:16px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#fcf8e3;border:1px solid #fbeed5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;color:#c09853;background-image:url(warn_message_icon.png);border-color:#aaaa66;background-color:#ffffcc;} .donemessagelarge{padding:8px 35px 8px 14px;margin-bottom:16px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#fcf8e3;border:1px solid #fbeed5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;color:#c09853;background-color:#ccffcc;border-color:#1a9900;color:#006600;padding-left:52px;background-image:url(done_message_icon.png);} -.infomessagelarge{background-image:url(info_message_icon.png);border-color:#6666aa;background-color:#ccccff;} +.infomessagelarge{padding:8px 35px 8px 14px;margin-bottom:16px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#fcf8e3;border:1px solid #fbeed5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;color:#c09853;background-color:#d9edf7;border-color:#bce8f1;color:#3a87ad;background-image:url(info_message_icon.png);border-color:#6666aa;background-color:#ccccff;} .screencastBox{padding-left:10px;border-color:#AAAA66;background-color:#FFFFCC;background-image:none;} .errormessage,.warningmessage,.donemessage,.infomessage,.errormessagesmall,.warningmessagesmall,.donemessagesmall,.infomessagesmall{padding:8px 35px 8px 14px;margin-bottom:16px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#fcf8e3;border:1px solid #fbeed5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;color:#c09853;padding:5px;padding-left:25px;min-height:15px;background-image:url(error_small.png);background-repeat:no-repeat;background-position:5px 5px;} .errormessage{background-color:#f2dede;border-color:#eed3d7;color:#b94a48;} diff -r 691da36cb16e533af00dfaf72c69bd878c58384d -r 31b3f926d9284eee0331245b3be5299c0f7d9dd1 static/june_2007_style/galaxy_bootstrap.less --- a/static/june_2007_style/galaxy_bootstrap.less +++ b/static/june_2007_style/galaxy_bootstrap.less @@ -134,7 +134,7 @@ // Components: Popovers @import "bootstrap/modals.less"; -@import "bootstrap/tooltip.less"; +// @import "bootstrap/tooltip.less"; @import "bootstrap/popovers.less"; // Components: Misc diff -r 691da36cb16e533af00dfaf72c69bd878c58384d -r 31b3f926d9284eee0331245b3be5299c0f7d9dd1 templates/base_panels.mako --- a/templates/base_panels.mako +++ b/templates/base_panels.mako @@ -236,15 +236,11 @@ <div class="drag"></div></div></div> - <div id="left-border"> - <div id="left-border-inner" style="display: none;"></div> - </div> %endif <div id="center"> ${self.center_panel()} </div> %if self.has_right_panel: - <div id="right-border"><div id="right-border-inner" style="display: none;"></div></div><div id="right"> ${self.right_panel()} <div class="unified-panel-footer"> diff -r 691da36cb16e533af00dfaf72c69bd878c58384d -r 31b3f926d9284eee0331245b3be5299c0f7d9dd1 templates/root/history.mako --- a/templates/root/history.mako +++ b/templates/root/history.mako @@ -1,7 +1,7 @@ <%namespace file="/message.mako" import="render_msg" /><% _=n_ %> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<!DOCTYPE HTML><html> @@ -467,6 +467,7 @@ </head><body class="historyPage"> + <div id="top-links" class="historyLinks"><a title="${_('refresh')}" class="icon-button arrow-circle tooltip" href="${h.url_for('history', show_deleted=show_deleted)}"></a> @@ -478,10 +479,9 @@ <a id="history-annotate" title="Edit history annotation" class="icon-button annotate tooltip" target="galaxy_main" href="${h.url_for( controller='history', action='annotate' )}"></a></div> %endif - </div> -<div style="clear: both;"></div> +<div class="clear"></div> %if show_deleted: <div class="historyLinks"> diff -r 691da36cb16e533af00dfaf72c69bd878c58384d -r 31b3f926d9284eee0331245b3be5299c0f7d9dd1 templates/workflow/editor.mako --- a/templates/workflow/editor.mako +++ b/templates/workflow/editor.mako @@ -7,15 +7,15 @@ %></%def> -<%def name="late_javascripts()"> - <script type='text/javascript' src="${h.url_for('/static/scripts/galaxy.panels.js')}"></script> - <script type="text/javascript"> - ensure_dd_helper(); - make_left_panel( $("#left"), $("#center"), $("#left-border" ) ); - make_right_panel( $("#right"), $("#center"), $("#right-border" ) ); - ## handle_minwidth_hint = rp.handle_minwidth_hint; - </script> -</%def> +## <%def name="late_javascripts()"> +## <script type='text/javascript' src="${h.url_for('/static/scripts/galaxy.panels.js')}"></script> +## <script type="text/javascript"> +## ensure_dd_helper(); +## make_left_panel( $("#left"), $("#center"), $("#left-border" ) ); +## make_right_panel( $("#right"), $("#center"), $("#right-border" ) ); +## ## handle_minwidth_hint = rp.handle_minwidth_hint; +## </script> +## </%def><%def name="javascripts()"> @@ -727,9 +727,9 @@ body { margin: 0; padding: 0; overflow: hidden; } /* Wider right panel */ - #center { right: 309px; } - #right-border { right: 300px; } - #right { width: 300px; } + ## #center { right: 309px; } + ## #right-border { right: 300px; } + ## #right { width: 300px; } ## /* Relative masthead size */ ## #masthead { height: 2.5em; } ## #masthead div.title { font-size: 1.8em; } https://bitbucket.org/galaxy/galaxy-central/changeset/3e01fd6ea098/ changeset: 3e01fd6ea098 user: james_taylor date: 2012-02-23 21:44:09 summary: style: fix dialog boxes affected #: 11 files diff -r 31b3f926d9284eee0331245b3be5299c0f7d9dd1 -r 3e01fd6ea098bb5fc6d1225784c568c399f330cd static/june_2007_style/base.less --- a/static/june_2007_style/base.less +++ b/static/june_2007_style/base.less @@ -130,6 +130,14 @@ border-left: solid @layout_border 1px; } +.subnavbar { + #gradient > .vertical-three-colors(@white, @white, 25%, darken(@white, 10%)); + border-bottom: solid @layout_border 1px; + border-top: solid @layout_border 1px; + padding: 5px; + color: #555; +} + .unified-panel-header { .unselectable(); height: @panel_header_height; @@ -166,7 +174,7 @@ width: 100%; z-index: 1000; border-top: solid @layout_border 1px; - #gradient > .vertical-three-colors(@white, @white, 25%, darken(@white, 10%)); + #gradient > .vertical-three-colors(darken(@white, 5%), darken(@white, 5%), 25%, darken(@white, 10%)); color: #555; a { @@ -200,7 +208,7 @@ background: none; border-right: solid @layout_border 1px; border-top: solid @layout_border 1px; - #gradient > .vertical-three-colors(@white, @white, 25%, darken(@white, 10%)); + #gradient > .vertical-three-colors(darken(@white, 5%), darken(@white, 5%), 25%, darken(@white, 10%)); .iconic(); } @@ -281,7 +289,7 @@ z-index: 20000; } -#overlay.modal #overlay-background { +#overlay.is_modal #overlay-background { background: rgba(0,0,0,0.5); } @@ -306,7 +314,7 @@ z-index: 80000; } -#overlay.modal .dialog-box .body { +#overlay.is_modal .dialog-box .body { min-width: 600px; } @@ -630,6 +638,7 @@ } div.form-row-input { + width: 300px; float: left; } @@ -643,7 +652,7 @@ float: left; color: red; font-weight: bold; - padding: 3px 0 0 1em; + padding: 3px 0; } .form-row .help { @@ -659,6 +668,24 @@ max-width: 300px; } +/* +.search-query { + display: inline-block; + width: 210px; + height: @baseLineHeight; + padding: 4px; + margin-bottom: 9px; + font-size: @baseFontSize; + line-height: @baseLineHeight; + color: @gray; + border: 1px solid @formElementBorder; + padding-left: 14px; + padding-right: 14px; + margin-bottom: 0; // remove the default margin on all inputs + .border-radius(14px); +} +*/ + // Messages .errormessagelarge, .warningmessagelarge, .donemessagelarge, .infomessagelarge { @@ -668,6 +695,8 @@ border: 1px solid @error_message_border; background-color: @error_message_bg; */ + .alert(); + min-height: 32px; padding-left: 52px; background-image: url(error_message_icon.png); background-repeat: no-repeat; @@ -680,14 +709,12 @@ } .warningmessagelarge { - .alert(); background-image: url(warn_message_icon.png); border-color: @warn_message_border; background-color: @warn_message_bg; } .donemessagelarge { - .alert(); .alert-success(); padding-left: 52px; background-image: url(done_message_icon.png); @@ -696,7 +723,6 @@ } .infomessagelarge { - .alert(); .alert-info(); background-image: url(info_message_icon.png); border-color: @info_message_border; @@ -974,6 +1000,10 @@ // Button styles +button { + .btn(); +} + .action-button { .btn(); } @@ -1284,13 +1314,7 @@ cursor: text; border: dotted #999999 1px; } -/* -.text-and-autocomplete-select { - -sprite-group: fugue; - -sprite-image: fugue/control-270.png; - -sprite-horiz-position: right; -} -*/ + .icon-button.multiinput{ background:url(../images/documents-stack.png) no-repeat; cursor:pointer; @@ -1330,10 +1354,10 @@ // Default history item appearance div.historyItem { - margin: -5px -5px 5px 0px; - padding: 5px 11px 5px 5px; - border: solid @history_queued_border 1px; - border-left: solid @history_queued_border 5px; + margin: 0px -5px; + padding: 8px 10px; + border-top: solid @layout_border 1px; + // border-left: solid @history_queued_border 5px; border-right: none; word-wrap: break-word; background: @history_queued_bg; @@ -1351,6 +1375,10 @@ } } +.historyItemContainer:last-child div.historyItem { + border-bottom: solid @layout_border 1px; +} + // Nested history items div.historyItem div.historyItem { margin-right: -11px; @@ -1359,7 +1387,7 @@ // Change background/border color depending on state div.historyItem-ok, div.historyItem-failed_metadata { - border-color: @history_ok_border; + // border-color: @history_ok_border; background: @history_ok_bg; .state-icon { display: none; @@ -1367,7 +1395,7 @@ } div.historyItem-error { - border-color: @history_error_border; + // border-color: @history_error_border; background: @history_error_bg; .state-icon { -sprite-group: history-states; @@ -1376,7 +1404,7 @@ } div.historyItem-empty { - border-color: @history_error_border; + // border-color: @history_error_border; background: @history_error_bg; .state-icon { -sprite-group: history-states; @@ -1385,7 +1413,7 @@ } div.historyItem-running { - border-color: @history_running_border; + // border-color: @history_running_border; background: @history_running_bg; .state-icon { background-image: url(data_running.gif); @@ -1393,7 +1421,7 @@ } div.historyItem-setting_metadata { - border-color: @history_running_border; + // border-color: @history_running_border; background: @history_running_bg; .state-icon { background-image: url(data_running.gif); @@ -1401,7 +1429,7 @@ } div.historyItem-upload { - border-color: @history_upload_border; + // border-color: @history_upload_border; background: @history_upload_bg; .state-icon { background-image: url(data_upload.gif); @@ -1409,7 +1437,7 @@ } div.historyItem-queued { - background: @history_queued_bg; + // background: @history_queued_bg; .state-icon { -sprite-group: history-states; -sprite-image: data_queued.png; diff -r 31b3f926d9284eee0331245b3be5299c0f7d9dd1 -r 3e01fd6ea098bb5fc6d1225784c568c399f330cd static/june_2007_style/blue/base.css --- a/static/june_2007_style/blue/base.css +++ b/static/june_2007_style/blue/base.css @@ -21,9 +21,9 @@ p{margin:0 0 8px;font-family:"Lucida Grande",verdana,arial,helvetica,sans-serif;font-size:12px;line-height:16px;}p small{font-size:10px;color:#999999;} .lead{margin-bottom:16px;font-size:20px;font-weight:200;line-height:24px;} h1,h2,h3,h4,h5,h6{margin:0;font-weight:bold;color:#333333;text-rendering:optimizelegibility;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;color:#999999;} -h1{font-size:30px;line-height:32px;}h1 small{font-size:18px;} -h2{font-size:24px;line-height:32px;}h2 small{font-size:18px;} -h3{line-height:24px;font-size:18px;}h3 small{font-size:14px;} +h1{font-size:24px;line-height:32px;}h1 small{font-size:18px;} +h2{font-size:18px;line-height:24px;}h2 small{font-size:14px;} +h3{line-height:16px;font-size:14px;}h3 small{font-size:12px;} h4,h5,h6{line-height:16px;} h4{font-size:14px;}h4 small{font-size:12px;} h5{font-size:12px;} @@ -138,15 +138,15 @@ .btn:hover .caret,.open.btn-group .caret{opacity:1;filter:alpha(opacity=100);} .btn-primary .caret,.btn-danger .caret,.btn-info .caret,.btn-success .caret{border-top-color:#ffffff;opacity:0.75;filter:alpha(opacity=75);} .btn-small .caret{margin-top:4px;} -.alert{padding:8px 35px 8px 14px;margin-bottom:16px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#fcf8e3;border:1px solid #fbeed5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} -.alert,.alert-heading{color:#c09853;} +.alert{padding:8px 35px 8px 14px;margin-bottom:16px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#ffffcc;border:1px solid #ffdd33;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} +.alert,.alert-heading{color:#666600;} .alert .close{position:relative;top:-2px;right:-21px;line-height:18px;} .alert-success{background-color:#ccffcc;border-color:#1a9900;} .alert-success,.alert-success .alert-heading{color:#006600;} -.alert-danger,.alert-error{background-color:#f2dede;border-color:#eed3d7;} -.alert-danger,.alert-error,.alert-danger .alert-heading,.alert-error .alert-heading{color:#b94a48;} -.alert-info{background-color:#d9edf7;border-color:#bce8f1;} -.alert-info,.alert-info .alert-heading{color:#3a87ad;} +.alert-danger,.alert-error{background-color:#ffcccc;border-color:#ff3355;} +.alert-danger,.alert-error,.alert-danger .alert-heading,.alert-error .alert-heading{color:#660000;} +.alert-info{background-color:#d9edf7;border-color:#1b7183;} +.alert-info,.alert-info .alert-heading{color:#134158;} .alert-block{padding-top:14px;padding-bottom:14px;} .alert-block>p,.alert-block>ul{margin-bottom:0;} .alert-block p+p{margin-top:5px;} @@ -500,12 +500,13 @@ #center{left:250px;right:250px;overflow:hidden;z-index:1;} #right-border{right:250px;} #right{width:250px;right:0px;z-index:200;border-left:solid #999999 1px;} +.subnavbar{background-color:#fafafa;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border-bottom:solid #999999 1px;border-top:solid #999999 1px;padding:5px;color:#555;} .unified-panel-header{-webkit-user-select:none;-moz-user-select:none;-o-user-select:none;user-select:none;height:30px;z-index:1000;text-shadow:rgba(255, 255, 255, 0.8) 0 1px 0;background-color:#fafafa;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border-bottom:solid #999999 1px;margin:0;padding:0;padding-right:10px;padding-left:10px;font-weight:bold;color:#555;}.unified-panel-header a{color:#555;} .unified-panel-header-inner{padding-top:8px;} -.unified-panel-footer{-webkit-user-select:none;-moz-user-select:none;-o-user-select:none;user-select:none;position:absolute;bottom:0;height:25px;line-height:25px;width:100%;z-index:1000;border-top:solid #999999 1px;background-color:#fafafa;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);color:#555;}.unified-panel-footer a{color:#555;} +.unified-panel-footer{-webkit-user-select:none;-moz-user-select:none;-o-user-select:none;user-select:none;position:absolute;bottom:0;height:25px;line-height:25px;width:100%;z-index:1000;border-top:solid #999999 1px;background-color:#f0f0f0;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), color-stop(25%, #f2f2f2), to(#e6e6e6));background-image:-webkit-linear-gradient(#f2f2f2, #f2f2f2 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #f2f2f2, #f2f2f2 25%, #e6e6e6);background-image:-ms-linear-gradient(#f2f2f2, #f2f2f2 25%, #e6e6e6);background-image:-o-linear-gradient(#f2f2f2, #f2f2f2 25%, #e6e6e6);background-image:linear-gradient(#f2f2f2, #f2f2f2 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f2f2f2', endColorstr='#e6e6e6', GradientType=0);color:#555;}.unified-panel-footer a{color:#555;} .unified-panel-footer .drag,.unified-panel-footer .collapse{position:absolute;top:0;right:0;padding:0 5px;text-align:center;height:25px;width:20px;background-image:url(../images/visualization/draggable_horizontal.png);background-repeat:no-repeat;background-position:50% 50%;} .unified-panel-footer .drag{cursor:w-resize;} -.unified-panel-footer .collapse{position:fixed;left:0;top:inherit;bottom:0;background:none;border-right:solid #999999 1px;border-top:solid #999999 1px;background-color:#fafafa;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);display:inline-block;font-family:'IconicStroke';} +.unified-panel-footer .collapse{position:fixed;left:0;top:inherit;bottom:0;background:none;border-right:solid #999999 1px;border-top:solid #999999 1px;background-color:#f0f0f0;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), color-stop(25%, #f2f2f2), to(#e6e6e6));background-image:-webkit-linear-gradient(#f2f2f2, #f2f2f2 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #f2f2f2, #f2f2f2 25%, #e6e6e6);background-image:-ms-linear-gradient(#f2f2f2, #f2f2f2 25%, #e6e6e6);background-image:-o-linear-gradient(#f2f2f2, #f2f2f2 25%, #e6e6e6);background-image:linear-gradient(#f2f2f2, #f2f2f2 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f2f2f2', endColorstr='#e6e6e6', GradientType=0);display:inline-block;font-family:'IconicStroke';} .unified-panel-footer .collapse:before{content:'\2190';} .unified-panel-footer .collapse.hidden:before{content:'\2192';} #right>.unified-panel-footer .drag{left:0;} @@ -519,17 +520,17 @@ .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.modal #overlay-background{background:rgba(0, 0, 0, 0.5);} +#overlay.is_modal #overlay-background{background:rgba(0, 0, 0, 0.5);} .dialog-box-container{position:relative;margin-top:80px;margin-right:auto;margin-left:auto;} .dialog-box-wrapper{position:relative;padding:1em;background-color:rgba(0, 0, 0, 0.5);-moz-border-radius:1em;-webkit-border-radius:1em;} .dialog-box{border:solid #999 1px;background:white;z-index:80000;} -#overlay.modal .dialog-box .body{min-width:600px;} +#overlay.is_modal .dialog-box .body{min-width:600px;} .dialog-box .body{padding:5px;overflow:auto;max-height:500px;min-width:300px;} .dialog-box .buttons{padding:5px;} .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;} .panel-done-message{background-image:url(done_small.png);background-color:#ccffcc;} -.panel-info-message{background-image:url(info_small.png);background-color:#ccccff;} +.panel-info-message{background-image:url(info_small.png);background-color:#d9edf7;} #masthead{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;overflow:visible;margin-bottom:16px;position:absolute;top:0;left:0;width:100%;min-width:900px;height:32px;border-bottom:solid #444444 1px;z-index:15000;padding:0;}#masthead .brand:hover{text-decoration:none;} #masthead .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;font-size:20px;font-weight:200;line-height:1;color:#ffffff;} #masthead .navbar-text{margin-bottom:0;line-height:40px;color:#999999;}#masthead .navbar-text a:hover{color:#ffffff;background-color:transparent;} @@ -574,23 +575,23 @@ div.form-row-error{background:#ffcccc;} div.form-row label{font-weight:bold;display:block;margin-bottom:.2em;} div.form-row label.inline{display:inline;} -div.form-row-input{float:left;} +div.form-row-input{width:300px;float:left;} div.form-row-input label{font-weight:normal;display:inline;} -div.form-row-error-message{width:300px;float:left;color:red;font-weight:bold;padding:3px 0 0 1em;} +div.form-row-error-message{width:300px;float:left;color:red;font-weight:bold;padding:3px 0;} .form-row .help{color:#666;} select,input,textarea{font:inherit;} select,textarea,input[type="text"],input[type="file"],input[type="password"]{max-width:300px;} -.errormessagelarge,.warningmessagelarge,.donemessagelarge,.infomessagelarge{padding-left:52px;background-image:url(error_message_icon.png);background-repeat:no-repeat;background-position:10px 10px;} -.errormessagelarge{background-color:#f2dede;border-color:#eed3d7;color:#b94a48;padding-left:52px;} -.warningmessagelarge{padding:8px 35px 8px 14px;margin-bottom:16px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#fcf8e3;border:1px solid #fbeed5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;color:#c09853;background-image:url(warn_message_icon.png);border-color:#aaaa66;background-color:#ffffcc;} -.donemessagelarge{padding:8px 35px 8px 14px;margin-bottom:16px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#fcf8e3;border:1px solid #fbeed5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;color:#c09853;background-color:#ccffcc;border-color:#1a9900;color:#006600;padding-left:52px;background-image:url(done_message_icon.png);} -.infomessagelarge{padding:8px 35px 8px 14px;margin-bottom:16px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#fcf8e3;border:1px solid #fbeed5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;color:#c09853;background-color:#d9edf7;border-color:#bce8f1;color:#3a87ad;background-image:url(info_message_icon.png);border-color:#6666aa;background-color:#ccccff;} +.errormessagelarge,.warningmessagelarge,.donemessagelarge,.infomessagelarge{padding:8px 35px 8px 14px;margin-bottom:16px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#ffffcc;border:1px solid #ffdd33;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;color:#666600;min-height:32px;padding-left:52px;background-image:url(error_message_icon.png);background-repeat:no-repeat;background-position:10px 10px;} +.errormessagelarge{background-color:#ffcccc;border-color:#ff3355;color:#660000;padding-left:52px;} +.warningmessagelarge{background-image:url(warn_message_icon.png);border-color:#aaaa66;background-color:#ffffcc;} +.donemessagelarge{background-color:#ccffcc;border-color:#1a9900;color:#006600;padding-left:52px;background-image:url(done_message_icon.png);} +.infomessagelarge{background-color:#d9edf7;border-color:#1b7183;color:#134158;background-image:url(info_message_icon.png);border-color:#6666aa;background-color:#d9edf7;} .screencastBox{padding-left:10px;border-color:#AAAA66;background-color:#FFFFCC;background-image:none;} -.errormessage,.warningmessage,.donemessage,.infomessage,.errormessagesmall,.warningmessagesmall,.donemessagesmall,.infomessagesmall{padding:8px 35px 8px 14px;margin-bottom:16px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#fcf8e3;border:1px solid #fbeed5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;color:#c09853;padding:5px;padding-left:25px;min-height:15px;background-image:url(error_small.png);background-repeat:no-repeat;background-position:5px 5px;} -.errormessage{background-color:#f2dede;border-color:#eed3d7;color:#b94a48;} +.errormessage,.warningmessage,.donemessage,.infomessage,.errormessagesmall,.warningmessagesmall,.donemessagesmall,.infomessagesmall{padding:8px 35px 8px 14px;margin-bottom:16px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#ffffcc;border:1px solid #ffdd33;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;color:#666600;padding:5px;padding-left:25px;min-height:15px;background-image:url(error_small.png);background-repeat:no-repeat;background-position:5px 5px;} +.errormessage{background-color:#ffcccc;border-color:#ff3355;color:#660000;} .warningmessage,.warningmessagesmall{background-image:url(warn_small.png);} .donemessage,.donemessagesmall{background-color:#ccffcc;border-color:#1a9900;color:#006600;background-image:url(ok_small.png);} -.infomessage,.infomessagesmall{background-color:#d9edf7;border-color:#bce8f1;color:#3a87ad;background-image:url(info_small.png);} +.infomessage,.infomessagesmall{background-color:#d9edf7;border-color:#1b7183;color:#134158;background-image:url(info_small.png);} .errormark,.warningmark,.donemark,.infomark,.ok_bgr,.err_bgr{padding-left:20px;min-height:15px;background:url(error_small.png) no-repeat;} .warningmark{background-image:url(warn_small.png);} .donemark{background-image:url(ok_small.png);} @@ -631,6 +632,7 @@ .state-fg-ok{color:#66AA66;} .state-fg-error{color:#AA6666;} .state-fg-deleted{color:#3399FF;} +button{display:inline-block;padding:4px 10px 4px;font-size:12px;line-height:16px;color:#333333;text-align:center;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#fafafa;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;*margin-left:.3em;}button:first-child{*margin-left:0;} .action-button{display:inline-block;padding:4px 10px 4px;font-size:12px;line-height:16px;color:#333333;text-align:center;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#fafafa;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;*margin-left:.3em;}.action-button:first-child{*margin-left:0;} a.action-button{text-decoration:none;} .action-button>img{vertical-align:middle;} @@ -706,16 +708,17 @@ body.historyPage{background:#c1c9e5;color:#303030;margin:5px;border:0;padding:0;} a{color:#303030;} div.historyLinks{margin:5px 5px;} -div.historyItem{margin:5px -5px 5px 0px;padding:5px 11px 5px 5px;border:solid #888888 1px;border-left:solid #888888 5px;border-right:none;word-wrap:break-word;background:#eeeeee;}div.historyItem .state-icon{display:inline-block;vertical-align:middle;width:16px;height:16px;background-position:0 1px;background-repeat:no-repeat;} +div.historyItem{margin:0px -5px;padding:8px 10px;border-top:solid #999999 1px;border-right:none;word-wrap:break-word;background:#eeeeee;}div.historyItem .state-icon{display:inline-block;vertical-align:middle;width:16px;height:16px;background-position:0 1px;background-repeat:no-repeat;} div.historyItem .historyItemTitle{font-weight:bold;line-height:16px;} +.historyItemContainer:last-child div.historyItem{border-bottom:solid #999999 1px;} div.historyItem div.historyItem{margin-right:-11px;} -div.historyItem-ok,div.historyItem-failed_metadata{border-color:#66aa66;background:#ccffcc;}div.historyItem-ok .state-icon,div.historyItem-failed_metadata .state-icon{display:none;} -div.historyItem-error{border-color:#aa6666;background:#ffcccc;}div.historyItem-error .state-icon{-sprite-group:history-states;-sprite-image:data_error.png;} -div.historyItem-empty{border-color:#aa6666;background:#ffcccc;}div.historyItem-empty .state-icon{-sprite-group:history-states;-sprite-image:data_empty.png;} -div.historyItem-running{border-color:#aaaa66;background:#ffffcc;}div.historyItem-running .state-icon{background-image:url(data_running.gif);} -div.historyItem-setting_metadata{border-color:#aaaa66;background:#ffffcc;}div.historyItem-setting_metadata .state-icon{background-image:url(data_running.gif);} -div.historyItem-upload{border-color:#6666aa;background:#ccccff;}div.historyItem-upload .state-icon{background-image:url(data_upload.gif);} -div.historyItem-queued{background:#eeeeee;}div.historyItem-queued .state-icon{-sprite-group:history-states;-sprite-image:data_queued.png;} +div.historyItem-ok,div.historyItem-failed_metadata{background:#ccffcc;}div.historyItem-ok .state-icon,div.historyItem-failed_metadata .state-icon{display:none;} +div.historyItem-error{background:#ffcccc;}div.historyItem-error .state-icon{-sprite-group:history-states;-sprite-image:data_error.png;} +div.historyItem-empty{background:#ffcccc;}div.historyItem-empty .state-icon{-sprite-group:history-states;-sprite-image:data_empty.png;} +div.historyItem-running{background:#ffffcc;}div.historyItem-running .state-icon{background-image:url(data_running.gif);} +div.historyItem-setting_metadata{background:#ffffcc;}div.historyItem-setting_metadata .state-icon{background-image:url(data_running.gif);} +div.historyItem-upload{background:#ccccff;}div.historyItem-upload .state-icon{background-image:url(data_upload.gif);} +div.historyItem-queued .state-icon{-sprite-group:history-states;-sprite-image:data_queued.png;} div.historyItem-noPermission{filter:alpha(opacity=60);-moz-opacity:.60;opacity:.60;} div.historyItemTitleBar.spinner .state-icon{background:url(data_running.gif) 0 1px no-repeat !important;} div.historyItemButtons{float:right;} diff -r 31b3f926d9284eee0331245b3be5299c0f7d9dd1 -r 3e01fd6ea098bb5fc6d1225784c568c399f330cd static/june_2007_style/blue_colors.ini --- a/static/june_2007_style/blue_colors.ini +++ b/static/june_2007_style/blue_colors.ini @@ -24,7 +24,7 @@ done_message_border=#66AA66 done_message_bg=#CCFFCC info_message_border=#6666AA -info_message_bg=#CCCCFF +info_message_bg=#d9edf7 # Tables table_header_bg=#ebd9b2 table_row_bg=white diff -r 31b3f926d9284eee0331245b3be5299c0f7d9dd1 -r 3e01fd6ea098bb5fc6d1225784c568c399f330cd static/june_2007_style/bootstrap/forms.less --- a/static/june_2007_style/bootstrap/forms.less +++ b/static/june_2007_style/bootstrap/forms.less @@ -59,7 +59,7 @@ font-size: @baseFontSize; line-height: @baseLineHeight; color: @gray; - border: 1px solid #ccc; + border: 1px solid @formElementBorder; .border-radius(3px); } .uneditable-textarea { @@ -261,7 +261,7 @@ // -------------------------- // Mixin for form field states -.formFieldState(@textColor: #555, @borderColor: #ccc, @backgroundColor: #f5f5f5) { +.formFieldState(@textColor: #555, @borderColor: @formElementBorder, @backgroundColor: #f5f5f5) { // Set the text color > label, .help-block, @@ -392,7 +392,7 @@ text-align: center; text-shadow: 0 1px 0 @white; background-color: #f5f5f5; - border: 1px solid #ccc; + border: 1px solid @formElementBorder; .border-radius(3px 0 0 3px); } .active { @@ -412,7 +412,7 @@ .border-radius(3px 0 0 3px); } .uneditable-input { - border-right-color: #ccc; + border-right-color: @formElementBorder; } .add-on { margin-right: 0; diff -r 31b3f926d9284eee0331245b3be5299c0f7d9dd1 -r 3e01fd6ea098bb5fc6d1225784c568c399f330cd static/june_2007_style/bootstrap/type.less --- a/static/june_2007_style/bootstrap/type.less +++ b/static/june_2007_style/bootstrap/type.less @@ -37,24 +37,24 @@ } } h1 { - font-size: 30px; + font-size: 24px; line-height: @baseLineHeight * 2; small { font-size: 18px; } } h2 { - font-size: 24px; - line-height: @baseLineHeight * 2; + font-size: 18px; + line-height: @baseLineHeight * 1.5; small { - font-size: 18px; + font-size: 14px; } } h3 { - line-height: @baseLineHeight * 1.5; - font-size: 18px; + line-height: @baseLineHeight; + font-size: 14px; small { - font-size: 14px; + font-size: 12px; } } h4, h5, h6 { diff -r 31b3f926d9284eee0331245b3be5299c0f7d9dd1 -r 3e01fd6ea098bb5fc6d1225784c568c399f330cd static/june_2007_style/galaxy_bootstrap.less --- a/static/june_2007_style/galaxy_bootstrap.less +++ b/static/june_2007_style/galaxy_bootstrap.less @@ -40,6 +40,9 @@ // Buttons @primaryButtonBackground: @linkColor; +// Forms +@formElementBorder: @grayLight; + // COMPONENT VARIABLES @@ -68,21 +71,21 @@ @navbarLinkColorHover: @white; // Form states and alerts -@warningText: #c09853; -@warningBackground: #fcf8e3; -@warningBorder: darken(spin(@warningBackground, -10), 3%); +@warningText: darken(@warn_message_bg,70%); +@warningBackground: @warn_message_bg; +@warningBorder: darken(spin(@warningBackground, -10), 30%); -@errorText: #b94a48; -@errorBackground: #f2dede; -@errorBorder: darken(spin(@errorBackground, -10), 3%); +@errorText: darken(@error_message_bg,70%); +@errorBackground: @error_message_bg; +@errorBorder: darken(spin(@errorBackground, -10), 30%); @successText: darken(@done_message_bg,70%); @successBackground: @done_message_bg; @successBorder: darken(spin(@successBackground, -10), 60%); -@infoText: #3a87ad; -@infoBackground: #d9edf7; -@infoBorder: darken(spin(@infoBackground, -10), 7%); +@infoText: darken(@info_message_bg,70%); +@infoBackground: @info_message_bg; +@infoBorder: darken(spin(@info_message_bg, -10), 60%); diff -r 31b3f926d9284eee0331245b3be5299c0f7d9dd1 -r 3e01fd6ea098bb5fc6d1225784c568c399f330cd static/scripts/galaxy.panels.js --- a/static/scripts/galaxy.panels.js +++ b/static/scripts/galaxy.panels.js @@ -126,15 +126,15 @@ // Modal dialog boxes function hide_modal() { - $(".dialog-box-container" ).hide( 0, function() { + $("#overlay .modal" ).hide( 0, function() { $("#overlay").hide(); - $("#overlay").removeClass( "modal" ); + $("#overlay-background").removeClass( "in" ); $( ".dialog-box" ).find( ".body" ).children().remove(); } ); }; function show_modal() { - $("#overlay").addClass( "modal" ); + $("#overlay-background").addClass( "in" ); _show_modal.apply( this, arguments ); } @@ -144,41 +144,40 @@ function _show_modal( title, body, buttons, extra_buttons, init_fn ) { if ( title ) { - $( ".dialog-box" ).find( ".title" ).html( title ); - $( ".dialog-box" ).find( ".unified-panel-header" ).show(); + $( "#dialog-box .modal-header .title" ).html( title ); + $( "#dialog-box .modal-header" ).show(); } else { - $( ".dialog-box" ).find( ".unified-panel-header" ).hide(); + $( "#dialog-box .modal-header" ).hide(); } - var b = $( ".dialog-box" ).find( ".buttons" ).html( "" ); + var b = $( "#dialog-box" ).find( ".buttons" ).html( "" ); if ( buttons ) { $.each( buttons, function( name, value ) { b.append( $( '<button/>' ).text( name ).click( value ) ); b.append( " " ); }); - b.show(); - } else { - b.hide(); } - var b = $( ".dialog-box" ).find( ".extra_buttons" ).html( "" ); + var b = $( "#dialog-box" ).find( ".extra_buttons" ).html( "" ); if ( extra_buttons ) { $.each( extra_buttons, function( name, value ) { b.append( $( '<button/>' ).text( name ).click( value ) ); b.append( " " ); }); - b.show(); + } + if ( buttons || extra_buttons ) { + $( "#dialog-box .modal-footer" ).show(); } else { - b.hide(); + $( "#dialog-box .modal-footer" ).hide(); } if ( body == "progress" ) { - body = $("<img/>").attr("src", image_path + "/yui/rel_interstitial_loading.gif"); + body = $("<div class='progress progress-striped active'><div class='bar'></div></div>"); } var body_elt = $( ".dialog-box" ).find( ".body" ); // Clear min-width to allow for modal to take size of new body. body_elt.css("min-width", "0px"); - $( ".dialog-box" ).find( ".body" ).html( body ); - if ( ! $(".dialog-box-container").is( ":visible" ) ) { + $( "#dialog-box" ).find( ".modal-body" ).html( body ); + if ( ! $("#dialog-box").is( ":visible" ) ) { $("#overlay").show(); - $(".dialog-box-container").show(); + $("#dialog-box").show(); } // Fix min-width so that modal cannot shrink considerably if // new content is loaded. diff -r 31b3f926d9284eee0331245b3be5299c0f7d9dd1 -r 3e01fd6ea098bb5fc6d1225784c568c399f330cd templates/base_panels.mako --- a/templates/base_panels.mako +++ b/templates/base_panels.mako @@ -172,28 +172,26 @@ %endif > ## - <div id="overlay-background" style="position: absolute; width: 100%; height: 100%;"></div> + <div id="overlay-background" class="modal-backdrop fade"></div> ## Need a table here for centering in IE6 - <table class="dialog-box-container" border="0" cellpadding="0" cellspacing="0" + <div id="dialog-box" class="modal" border="0" %if not visible: style="display: none;" %endif - ><tr><td> - <div class="dialog-box-wrapper"> - <div class="dialog-box"> - <div class="unified-panel-header"> - <div class="unified-panel-header-inner"><span class='title'>${title}</span></div> + > + <div class="modal-header"> + <span><h3 class='title'>${title}</h3></span></div> - <div class="body">${content}</div> - <div> - <div class="buttons" style="display: none; float: right;"></div> - <div class="extra_buttons" style="display: none; padding: 5px;"></div> + <div class="modal-body">${content}</div> + <div class="modal-footer"> + <div class="buttons" style="float: right;"></div> + <div class="extra_buttons" style=""></div><div style="clear: both;"></div></div> - </div> + </div> - </td></tr></table> + </div></%def> diff -r 31b3f926d9284eee0331245b3be5299c0f7d9dd1 -r 3e01fd6ea098bb5fc6d1225784c568c399f330cd templates/root/history.mako --- a/templates/root/history.mako +++ b/templates/root/history.mako @@ -568,6 +568,7 @@ %else: ## Render requested datasets, ordered from newest to oldest + <div> %for data in reversed( datasets ): %if data.visible or show_hidden: <div class="historyItemContainer" id="historyItemContainer-${trans.app.security.encode_id(data.id)}"> @@ -575,6 +576,7 @@ </div> %endif %endfor + </div><div class="infomessagesmall" id="emptyHistoryMessage" style="display:none;"> %endif diff -r 31b3f926d9284eee0331245b3be5299c0f7d9dd1 -r 3e01fd6ea098bb5fc6d1225784c568c399f330cd templates/root/tool_menu.mako --- a/templates/root/tool_menu.mako +++ b/templates/root/tool_menu.mako @@ -321,12 +321,12 @@ else: display = "none" %> - <div id="tool-search" style="padding-bottom: 5px; position: relative; display: ${display}; width: 100%"> + <div id="tool-search" class="bar" style="margin: -6px -10px 10px -10px; padding: 5px 10px; position: relative; display: ${display};"> %if trans.app.config.get_bool( 'enable_tool_tags', False ): <b>Tags:</b> ${render_tool_tagging_elements()} %endif - <input type="text" name="query" value="search tools" id="tool-search-query" autocomplete="off" style="width: 100%; font-style:italic; font-size: inherit"/> + <input type="text" name="query" value="search tools" id="tool-search-query" autocomplete="off" class="search-query" style="width: 90%"/><img src="${h.url_for('/static/images/loading_small_white_bg.gif')}" id="search-spinner" style="display: none; position: absolute; right: 0; top: 5px;"/></div> diff -r 31b3f926d9284eee0331245b3be5299c0f7d9dd1 -r 3e01fd6ea098bb5fc6d1225784c568c399f330cd templates/workflow/editor.mako --- a/templates/workflow/editor.mako +++ b/templates/workflow/editor.mako @@ -926,7 +926,7 @@ <%def name="overlay(visible=False)"> ${parent.overlay( "Loading workflow editor...", - "<img src='" + h.url_for('/static/images/yui/rel_interstitial_loading.gif') + "'/>", self.overlay_visible )} + "<div class='progress progress-striped progress-info active'><div class='bar' style='width: 100%;'></div></div>", self.overlay_visible )} </%def><%def name="left_panel()"> https://bitbucket.org/galaxy/galaxy-central/changeset/dce46e57a70b/ changeset: dce46e57a70b user: james_taylor date: 2012-02-24 18:57:25 summary: style: fixing header spacing affected #: 2 files diff -r 3e01fd6ea098bb5fc6d1225784c568c399f330cd -r dce46e57a70b85cb8b34751551e2c92001a3aa2e static/june_2007_style/base.less --- a/static/june_2007_style/base.less +++ b/static/june_2007_style/base.less @@ -41,6 +41,7 @@ h1, h2, h3, h4 { color: @header_text; + margin: 0.5em 0; /*text-shadow: #bbb 2px 2px 1px;*/ } @@ -391,10 +392,9 @@ padding: 6px 10px 8px; // Force cursor to be pointer since tabs are either a link of a button cursor: pointer; - } - - .nav > li > a:hover { - color: gold; + &:hover { + color: gold; + } } .dropdown-menu a, .dropdown-menu a:hover { @@ -1516,7 +1516,7 @@ div.toolSectionTitle { - // font-weight: bold; + font-weight: bold; } div.toolPanelLabel diff -r 3e01fd6ea098bb5fc6d1225784c568c399f330cd -r dce46e57a70b85cb8b34751551e2c92001a3aa2e static/june_2007_style/blue/base.css --- a/static/june_2007_style/blue/base.css +++ b/static/june_2007_style/blue/base.css @@ -487,7 +487,7 @@ body{background:#ffffff;color:#303030;background-image:url(base_bg.png);background-repeat:repeat-x;background-position:top;margin:10px;} img{border:0;} a:link,a:visited,a:active{text-decoration:underline;color:#303030;} -h1,h2,h3,h4{color:#023858;} +h1,h2,h3,h4{color:#023858;margin:0.5em 0;} h1:first-child,h2:first-child,h3:first-child,h4:first-child{margin-top:0px;} hr{border:none;height:0px;border-bottom:dotted #303030 1px;} table{border-collapse:collapse;} @@ -536,8 +536,7 @@ #masthead .navbar-text{margin-bottom:0;line-height:40px;color:#999999;}#masthead .navbar-text a:hover{color:#ffffff;background-color:transparent;} #masthead .btn,#masthead .btn-group{margin-top:5px;} #masthead .btn-group .btn{margin-top:0;} -#masthead .nav>li>a{padding:6px 10px 8px;cursor:pointer;} -#masthead .nav>li>a:hover{color:gold;} +#masthead .nav>li>a{padding:6px 10px 8px;cursor:pointer;}#masthead .nav>li>a:hover{color:gold;} #masthead .dropdown-menu a,#masthead .dropdown-menu a:hover{text-decoration:none;} #masthead .title{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;font-size:20px;font-weight:200;line-height:1;color:#ffffff;font-family:verdana;font-weight:bold;color:white;padding:5px 20px 12px;margin-left:-15px;z-index:2000;}#masthead .title a{color:white;text-decoration:none;} #masthead .masthead-inner{padding-left:20px;padding-right:20px;background-color:#303239;background-image:-moz-linear-gradient(top, #333333, #2c3143);background-image:-ms-linear-gradient(top, #333333, #2c3143);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#2c3143));background-image:-webkit-linear-gradient(top, #333333, #2c3143);background-image:-o-linear-gradient(top, #333333, #2c3143);background-image:linear-gradient(top, #333333, #2c3143);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#2c3143', GradientType=0);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);padding-left:0;padding-right:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;height:32px;} @@ -728,6 +727,7 @@ hr{border:none;height:0px;margin-top:0px;} div.toolSectionWrapper{margin-bottom:5px;} div.toolSectionDetailsInner{margin-left:5px;margin-right:5px;} +div.toolSectionTitle{font-weight:bold;} div.toolPanelLabel{font-weight:bold;color:gray;text-transform:uppercase;} div.toolTitle{padding-top:5px;padding-bottom:5px;margin-left:16px;margin-right:10px;display:list-item;list-style:square outside;} div.toolSectionBody div.toolPanelLabel{padding-top:5px;padding-bottom:5px;margin-left:16px;margin-right:10px;display:list-item;list-style:none outside;} https://bitbucket.org/galaxy/galaxy-central/changeset/e5460d5fa71f/ changeset: e5460d5fa71f user: james_taylor date: 2012-02-24 18:57:41 summary: Automated merge with https://bitbucket.org/galaxy/galaxy-central affected #: 65 files Diff too large to display. https://bitbucket.org/galaxy/galaxy-central/changeset/65e36ccf037c/ changeset: 65e36ccf037c user: james_taylor date: 2012-02-24 23:56:40 summary: style: rewrite modal dialog script affected #: 9 files diff -r e5460d5fa71f873ed72dd10cfa0ff8ffa3001dda -r 65e36ccf037c427a053f3331e7e3aca08befe5e5 static/june_2007_style/Makefile --- a/static/june_2007_style/Makefile +++ b/static/june_2007_style/Makefile @@ -19,7 +19,7 @@ # Old style using process_css still works so we can move gradually %.css : %.css.tmpl - ../process_css.py $(INI) shared_images:../images $(OUT) < $< > $@ + ../process_css.py ../$(INI) shared_images:../images $(OUT) < $< > $@ # For building sprite images %.less : %.less.tmpl diff -r e5460d5fa71f873ed72dd10cfa0ff8ffa3001dda -r 65e36ccf037c427a053f3331e7e3aca08befe5e5 static/june_2007_style/base.less --- a/static/june_2007_style/base.less +++ b/static/june_2007_style/base.less @@ -79,10 +79,10 @@ #messagebox { position:absolute; - top:33px; + top: @navbarHeight + @layout_top_padding + 1; left:0; width:100%; - height:24px !important; + height: @panel_header_height !important; overflow: hidden; border-bottom: solid #999 1px; font-size: 90%; diff -r e5460d5fa71f873ed72dd10cfa0ff8ffa3001dda -r 65e36ccf037c427a053f3331e7e3aca08befe5e5 static/june_2007_style/blue/base.css --- a/static/june_2007_style/blue/base.css +++ b/static/june_2007_style/blue/base.css @@ -493,7 +493,7 @@ table{border-collapse:collapse;} th{text-align:left;} #background{position:absolute;background:#eeeeee;z-index:-1;top:0;left:0;margin:0;padding:0;width:100%;height:100%;} -#messagebox{position:absolute;top:33px;left:0;width:100%;height:24px !important;overflow:hidden;border-bottom:solid #999 1px;font-size:90%;} +#messagebox{position:absolute;top:33px;left:0;width:100%;height:30px !important;overflow:hidden;border-bottom:solid #999 1px;font-size:90%;} #left,#left-border,#center,#right-border,#right{position:absolute;top:33px;bottom:0px;overflow:hidden;background:#fff;} #left{left:0px;width:250px;z-index:200;border-right:solid #999999 1px;} #left-border{left:250px;} diff -r e5460d5fa71f873ed72dd10cfa0ff8ffa3001dda -r 65e36ccf037c427a053f3331e7e3aca08befe5e5 static/june_2007_style/blue/trackster.css --- a/static/june_2007_style/blue/trackster.css +++ b/static/june_2007_style/blue/trackster.css @@ -1,6 +1,6 @@ .viewport-container{overflow-x:hidden;overflow-y:auto;} -.nav-container{width:100%;} -.nav{padding:0 0;color:#333;font-weight:bold;background:#cccccc;background-image:url(panel_header_bg.png);background-position:middle center;background-repeat:repeat-x;border-bottom:solid #333 1px;} +.trackster-nav-container{width:100%;} +.trackster-nav{padding:0 0;color:#333;font-weight:bold;background:#cccccc;background-image:url(panel_header_bg.png);background-position:middle center;background-repeat:repeat-x;border-bottom:solid #333 1px;} .content{font:10px verdana;} .nav-controls{text-align:center;padding:1px 0;} .nav-controls input{margin:0 5px;} @@ -57,11 +57,11 @@ .param-row{margin-top:0.2em;margin-left:1em;} .param-label{float:left;font-weight:bold;padding-top:0.2em;width:50%;} .menu-button{margin:0px 4px 0px 4px;} +.exclamation{background:transparent url(../images/fugue/exclamation.png) no-repeat;margin-left:5em;} .layer-transparent{background:transparent url(../images/fugue/layer-transparent-bw.png) no-repeat;} .layer-transparent.active{background:transparent url(../images/fugue/layer-transparent.png) no-repeat;} .arrow-resize-090{background:transparent url(../images/fugue/arrow-resize-090-bw.png) no-repeat;} .arrow-resize-090.active{background:transparent url(../images/fugue/arrow-resize-090.png) no-repeat;} -.exclamation{background:transparent url(../images/fugue/exclamation.png) no-repeat;margin-left:5em;} .layers-stack{background:transparent url(../images/fugue/layers-stack-bw.png) no-repeat;} .layers-stack:hover{background:transparent url(../images/fugue/layers-stack.png) no-repeat;} .chevron-expand{background:transparent url(../images/fugue/chevron-expand-bw.png) no-repeat;} @@ -94,6 +94,6 @@ .icon{display:inline-block;width:16px;height:16px;} .icon.more-down{background:url('../images/fugue/arrow-transition-270-bw.png') no-repeat 0px 0px;} .icon.more-across{background:url('../images/fugue/arrow-transition-bw.png') no-repeat 0px 0px;} -.intro > .action-button{margin:1em;padding:1em;text-decoration:underline;} +.intro > .action-button{background-color:#CCC;margin-top:10px;padding:1em;text-decoration:underline;} .feature-popup{position:absolute;z-index:1000;padding:5px;font-size:10px;filter:alpha(opacity=80);background-repeat:no-repeat;background-image:url(../images/tipsy.gif);background-position:top center;} -.feature-popup-inner{padding:5px 8px 4px 8px;background-color:black;color:white;} \ No newline at end of file +.feature-popup-inner{padding:5px 8px 4px 8px;background-color:black;color:white;} diff -r e5460d5fa71f873ed72dd10cfa0ff8ffa3001dda -r 65e36ccf037c427a053f3331e7e3aca08befe5e5 static/june_2007_style/trackster.css.tmpl --- a/static/june_2007_style/trackster.css.tmpl +++ b/static/june_2007_style/trackster.css.tmpl @@ -2,10 +2,10 @@ overflow-x: hidden; overflow-y: auto; } -.nav-container { +.trackster-nav-container { width: 100%; } -.nav { +.trackster-nav { padding: 0 0; color:#333; font-weight:bold; @@ -447,6 +447,7 @@ } .intro > .action-button { background-color: #CCC; + margin-top: 10px; padding: 1em; text-decoration:underline; } diff -r e5460d5fa71f873ed72dd10cfa0ff8ffa3001dda -r 65e36ccf037c427a053f3331e7e3aca08befe5e5 static/scripts/galaxy.panels.js --- a/static/scripts/galaxy.panels.js +++ b/static/scripts/galaxy.panels.js @@ -121,72 +121,97 @@ $(self.toggle).on( "click", function() { self.do_toggle(); } ); } }); - // Modal dialog boxes +var Modal = function( options ) { + this.$overlay = options.overlay; + this.$dialog = options.dialog; + this.$header = this.$dialog.find( ".modal-header" ); + this.$body = this.$dialog.find( ".modal-body" ); + this.$footer = this.$dialog.find( ".modal-footer" ); + this.$backdrop = options.backdrop; +} +$.extend( Modal.prototype, { + setContent: function( options ) { + // Title + if ( options.title ) { + this.$header.find( ".title" ).html( options.title ); + this.$header.show(); + } else { + this.$header.hide(); + } + // Buttons + this.$footer.hide(); + console.log( this.$footer, options.buttons ); + var $buttons = this.$footer.find( ".buttons" ).html( "" ); + if ( options.buttons ) { + $.each( options.buttons, function( name, value ) { + $buttons.append( $( '<button>' ).text( name ).click( value ) ); + }); + this.$footer.show(); + } + var $extraButtons = this.$footer.find( ".extra_buttons" ).html( "" ); + if ( options.extra_buttons ) { + $.each( options.extra_buttons, function( name, value ) { + $extraButtons.append( $( '<button>' ).text( name ).click( value ) ); + }); + this.$footer.show(); + } + // Body + var body = options.body; + if ( body == "progress" ) { + body = $("<div class='progress progress-striped active'><div class='bar' style='width: 100%'></div></div>"); + } + this.$body.html( body ); + }, + show: function( options, callback ) { + if ( ! this.$dialog.is( ":visible" ) ) { + if ( options.backdrop) { + this.$backdrop.addClass( "in" ); + } else { + this.$backdrop.removeClass( "in" ); + } + this.$overlay.show(); + this.$dialog.show(); + // Fix min-width so that modal cannot shrink considerably if + // new content is loaded. + this.$body.css( "min-width", this.$body.width() ); + } + // Callback on init + if ( callback ) { + callback(); + } + }, + hide: function() { + var modal = this; + modal.$dialog.fadeOut( function() { + modal.$overlay.hide(); + modal.$backdrop.removeClass( "in" ); + modal.$body.children().remove(); + // Clear min-width to allow for modal to take size of new body. + modal.$body.css( "min-width", undefined ); + }); + } +}); +var modal; + +$(function(){ + modal = new Modal( { overlay: $("#overlay"), dialog: $("#dialog-box"), backdrop: $("#overlay-background") } ); +}); + +// Backward compatibility function hide_modal() { - $("#overlay .modal" ).hide( 0, function() { - $("#overlay").hide(); - $("#overlay-background").removeClass( "in" ); - $( ".dialog-box" ).find( ".body" ).children().remove(); - } ); -}; - -function show_modal() { - $("#overlay-background").addClass( "in" ); - _show_modal.apply( this, arguments ); + modal.hide(); } - -function show_message() { - _show_modal.apply( this, arguments ); +function show_modal( title, body, buttons, extra_buttons, init_fn ) { + modal.setContent( { title: title, body: body, buttons: buttons, extra_buttons: extra_buttons } ); + modal.show( { backdrop: true }, init_fn ); } - -function _show_modal( title, body, buttons, extra_buttons, init_fn ) { - if ( title ) { - $( "#dialog-box .modal-header .title" ).html( title ); - $( "#dialog-box .modal-header" ).show(); - } else { - $( "#dialog-box .modal-header" ).hide(); - } - var b = $( "#dialog-box" ).find( ".buttons" ).html( "" ); - if ( buttons ) { - $.each( buttons, function( name, value ) { - b.append( $( '<button/>' ).text( name ).click( value ) ); - b.append( " " ); - }); - } - var b = $( "#dialog-box" ).find( ".extra_buttons" ).html( "" ); - if ( extra_buttons ) { - $.each( extra_buttons, function( name, value ) { - b.append( $( '<button/>' ).text( name ).click( value ) ); - b.append( " " ); - }); - } - if ( buttons || extra_buttons ) { - $( "#dialog-box .modal-footer" ).show(); - } else { - $( "#dialog-box .modal-footer" ).hide(); - } - if ( body == "progress" ) { - body = $("<div class='progress progress-striped active'><div class='bar'></div></div>"); - } - var body_elt = $( ".dialog-box" ).find( ".body" ); - // Clear min-width to allow for modal to take size of new body. - body_elt.css("min-width", "0px"); - $( "#dialog-box" ).find( ".modal-body" ).html( body ); - if ( ! $("#dialog-box").is( ":visible" ) ) { - $("#overlay").show(); - $("#dialog-box").show(); - } - // Fix min-width so that modal cannot shrink considerably if - // new content is loaded. - body_elt.css("min-width", body_elt.width()); - if ( init_fn ) { - init_fn(); - } -}; - +function show_message( title, body, buttons, extra_buttons, init_fn ) { + modal.setContent( { title: title, body: body, buttons: buttons, extra_buttons: extra_buttons } ); + modal.show( { backdrop: false }, init_fn ); +} function show_in_overlay( options ) { var width = options.width || '600'; var height = options.height || '400'; @@ -237,6 +262,7 @@ // Exports exports.ensure_dd_helper = ensure_dd_helper; exports.Panel = Panel; +exports.Modal = Modal; exports.hide_modal = hide_modal; exports.show_modal = show_modal; exports.show_message = show_message; diff -r e5460d5fa71f873ed72dd10cfa0ff8ffa3001dda -r 65e36ccf037c427a053f3331e7e3aca08befe5e5 static/scripts/trackster.js --- a/static/scripts/trackster.js +++ b/static/scripts/trackster.js @@ -1339,8 +1339,8 @@ // Another label track at bottom this.nav_labeltrack = $("<div/>").addClass("nav-labeltrack").appendTo(this.bottom_container); // Navigation at top - this.nav_container = $("<div/>").addClass("nav-container").prependTo(this.top_container); - this.nav = $("<div/>").addClass("nav").appendTo(this.nav_container); + this.nav_container = $("<div/>").addClass("trackster-nav-container").prependTo(this.top_container); + this.nav = $("<div/>").addClass("trackster-nav").appendTo(this.nav_container); // Overview (scrollbar and overview plot) at bottom this.overview = $("<div/>").addClass("overview").appendTo(this.bottom_container); this.overview_viewport = $("<div/>").addClass("overview-viewport").appendTo(this.overview); diff -r e5460d5fa71f873ed72dd10cfa0ff8ffa3001dda -r 65e36ccf037c427a053f3331e7e3aca08befe5e5 templates/base_panels.mako --- a/templates/base_panels.mako +++ b/templates/base_panels.mako @@ -166,31 +166,30 @@ <%def name="title()"></%def><%def name="content()"></%def> - <div id="overlay" - %if not visible: - style="display: none;" - %endif - > - ## - <div id="overlay-background" class="modal-backdrop fade"></div> - - ## Need a table here for centering in IE6 - <div id="dialog-box" class="modal" border="0" - %if not visible: - style="display: none;" - %endif - > - <div class="modal-header"> - <span><h3 class='title'>${title}</h3></span> - </div> - <div class="modal-body">${content}</div> - <div class="modal-footer"> - <div class="buttons" style="float: right;"></div> - <div class="extra_buttons" style=""></div> - <div style="clear: both;"></div> - </div> + <% + if visible: + display = "" + overlay_class = "in" + else: + display = "style='display: none;'" + overlay_class = "" + %> - </div> + <div id="overlay" ${display}> + + <div id="overlay-background" class="modal-backdrop fade $overlay_class"></div> + + <div id="dialog-box" class="modal" border="0" ${display}> + <div class="modal-header"> + <span><h3 class='title'>${title}</h3></span> + </div> + <div class="modal-body">${content}</div> + <div class="modal-footer"> + <div class="buttons" style="float: right;"></div> + <div class="extra_buttons" style=""></div> + <div style="clear: both;"></div> + </div> + </div></div></%def> diff -r e5460d5fa71f873ed72dd10cfa0ff8ffa3001dda -r 65e36ccf037c427a053f3331e7e3aca08befe5e5 templates/tracks/browser.mako --- a/templates/tracks/browser.mako +++ b/templates/tracks/browser.mako @@ -18,13 +18,13 @@ #browser-container { overflow: none; } - .nav-container { + .trackster-nav-container { width: 100%; ## Overriding styles from trackster.css to push nav up into title bar height: 0; text-align: center; } - .nav { + .trackster-nav { ## Overriding styles from trackster.css to push nav up into title bar position: relative; display: inline-block; https://bitbucket.org/galaxy/galaxy-central/changeset/93a4eeb167d9/ changeset: 93a4eeb167d9 user: james_taylor date: 2012-02-27 20:42:39 summary: style: making menubuttons look like other buttons, buttons in grids now look like buttons affected #: 5 files diff -r 65e36ccf037c427a053f3331e7e3aca08befe5e5 -r 93a4eeb167d9f9c355ef5372c5a07f1c6ece8494 static/june_2007_style/base.less --- a/static/june_2007_style/base.less +++ b/static/june_2007_style/base.less @@ -34,10 +34,12 @@ } +/* a:link, a:visited, a:active { text-decoration: underline; color: @link_text; } +*/ h1, h2, h3, h4 { color: @header_text; @@ -790,6 +792,7 @@ background-image: url(info_small.png); } +/* I think this is only used in view details */ table.simple { font-size: 12px; background: #fff; @@ -809,7 +812,6 @@ table.simple tbody tr:hover td { color: #333; } - table.tabletip { width: 100%; border-collapse: collapse; @@ -827,6 +829,7 @@ background-color: #eee; } + table.colored { border-top: solid @table_border 1px; border-bottom: solid @table_border 1px; @@ -835,6 +838,7 @@ table.colored td, table.colored th { text-align: left; padding: 5px; + line-height: @baseLineHeight; } table.colored tr.header { @@ -862,6 +866,63 @@ color: black; } +// Data grid style + +.grid-header { + padding-bottom: 1em; +} + +.grid-header h2 { + margin: 0; + margin-bottom: 0.5em; +} + +.grid-header .title { + font-weight: bold; +} + +.grid { + padding-top: 1em; + border-collapse: collapse; + width: 100%; +} +.grid tbody td { + line-height: @baseLineHeight; + border-top: solid #DDDDDD 1px; + border-bottom: solid #DDDDDD 1px; + padding: 0.3em 0.5em; +} +.grid tbody td:empty { + padding: 0; +} +.grid thead tr { + height: 2em; +} +.grid thead th { + line-height: @baseLineHeight; + background: @table_header_bg; + // background-image: url(form_title_bg.png); + background-repeat: repeat-x; + background-position: top; + border-top: solid @table_border 1px; + border-bottom: solid @table_border 1px; + padding: 0.3em 0.5em; + text-align: left; + white-space: nowrap; +} +.grid tfoot td { + background-color: #F8F8F8; + border-top: solid #DDDDDD 1px; + border-bottom: solid #DDDDDD 1px; + padding: 0.3em 0.5em; +} +.grid .current { + background-color: #EEEEFF; +} + + + + div.odd_row { background: @odd_row_bg; } @@ -1040,47 +1101,52 @@ position: relative; .unselectable; - border: solid transparent 1px; - -moz-border-radius: 0.25em; - -webkit-border-radius: 0.25em; - border-radius: 0.25em; + // border: solid transparent 1px; + // -moz-border-radius: 0.25em; + // -webkit-border-radius: 0.25em; + // border-radius: 0.25em; - padding: 1px 0.25em; - margin: -1px -0.25em; + // padding: 1px 0.25em; + // margin: -1px -0.25em; .label { position: relative; - display: block; + // display: block; border-right: none; + text-decoration: none; } -} -.menubutton.action-button { - border-color: #aaaaaa; -} + &.popup .label { + border-right: solid @buttonBorder 1px; + padding-right: 6px; + } -.menubutton.popup, .action-button.popup { - padding-right: 20px; - background-image: url(../images/dropdownarrow.png); - background-repeat: no-repeat; - background-position: right 7px; -} + &.popup { + &:after { + margin-top: 6px; + .caret(); + } + } -.menubutton:hover { - border-color: #aaaaaa; - // background: #eeeeee; - // color: #333; + &.popup.split { + &:after { + margin-top: 6px; + margin-left: 0px; + .caret(); + } + } + } // A split menu button, the main button has an action, the arrow causes the // popup menu to appear .menubutton.popup.split { - padding-right: 2em; + // padding-right: 2em; } .menubutton.popup.split:hover { - background: url(../images/ddarrowsplit.png) no-repeat right -39px; + //background: url(../images/ddarrowsplit.png) no-repeat right -39px; } // Popup menu styles @@ -1164,58 +1230,6 @@ padding-left: 20px; } -// Data grid style - -.grid-header { - padding-bottom: 1em; -} - -.grid-header h2 { - margin: 0; - margin-bottom: 0.5em; -} - -.grid-header .title { - font-weight: bold; -} - -.grid { - padding-top: 1em; - border-collapse: collapse; - width: 100%; -} -.grid tbody td { - border-top: solid #DDDDDD 1px; - border-bottom: solid #DDDDDD 1px; - padding: 0.3em 0.5em; -} -.grid tbody td:empty { - padding: 0; -} -.grid thead tr { - height: 2em; -} -.grid thead th { - background: @table_header_bg; - // background-image: url(form_title_bg.png); - background-repeat: repeat-x; - background-position: top; - border-top: solid @table_border 1px; - border-bottom: solid @table_border 1px; - padding: 0.3em 0.5em; - text-align: left; - white-space: nowrap; -} -.grid tfoot td { - background-color: #F8F8F8; - border-top: solid #DDDDDD 1px; - border-bottom: solid #DDDDDD 1px; - padding: 0.3em 0.5em; -} -.grid .current { - background-color: #EEEEFF; -} - // Styles for areas of text content .text-content { @@ -1343,10 +1357,6 @@ padding: 0; } -a { - color: @base_text; -} - // Control links at top of history div.historyLinks { margin: 5px 5px; diff -r 65e36ccf037c427a053f3331e7e3aca08befe5e5 -r 93a4eeb167d9f9c355ef5372c5a07f1c6ece8494 static/june_2007_style/blue/base.css --- a/static/june_2007_style/blue/base.css +++ b/static/june_2007_style/blue/base.css @@ -95,10 +95,10 @@ .fade{-webkit-transition:opacity 0.15s linear;-moz-transition:opacity 0.15s linear;-ms-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;opacity:0;}.fade.in{opacity:1;} .collapse{-webkit-transition:height 0.35s ease;-moz-transition:height 0.35s ease;-ms-transition:height 0.35s ease;-o-transition:height 0.35s ease;transition:height 0.35s ease;position:relative;overflow:hidden;height:0;}.collapse.in{height:auto;} .close{float:right;font-size:20px;font-weight:bold;line-height:16px;color:#000000;text-shadow:0 1px 0 #ffffff;opacity:0.2;filter:alpha(opacity=20);}.close:hover{color:#000000;text-decoration:none;opacity:0.4;filter:alpha(opacity=40);cursor:pointer;} -.btn{display:inline-block;padding:4px 10px 4px;font-size:12px;line-height:16px;color:#333333;text-align:center;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#fafafa;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;*margin-left:.3em;}.btn:first-child{*margin-left:0;} +.btn{display:inline-block;padding:4px 10px 4px;font-size:12px;line-height:16px;color:#333333;text-align:center;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#fafafa;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border:1px solid #999999;border-bottom-color:#888888;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;*margin-left:.3em;}.btn:first-child{*margin-left:0;} .btn.hover,.btn:hover{color:#333333;text-decoration:none;background-color:#e6e6e6;background-position:0 -15px;-webkit-transition:background-position 0.1s linear;-moz-transition:background-position 0.1s linear;-ms-transition:background-position 0.1s linear;-o-transition:background-position 0.1s linear;transition:background-position 0.1s linear;} .btn:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;} -.btn.active,.btn:active{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);background-color:#e6e6e6;background-color:#d9d9d9 \9;color:rgba(0, 0, 0, 0.5);outline:0;} +.btn.active,.btn:active{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);background-color:#e6e6e6;background-color:#d9d9d9 \9;outline:0;} .btn.disabled,.btn[disabled]{cursor:default;background-image:none;background-color:#e6e6e6;opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .btn-large{padding:9px 14px;font-size:14px;line-height:normal;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;} .btn-large .icon{margin-top:1px;} @@ -486,7 +486,6 @@ .clear:after{clear:both;} body{background:#ffffff;color:#303030;background-image:url(base_bg.png);background-repeat:repeat-x;background-position:top;margin:10px;} img{border:0;} -a:link,a:visited,a:active{text-decoration:underline;color:#303030;} h1,h2,h3,h4{color:#023858;margin:0.5em 0;} h1:first-child,h2:first-child,h3:first-child,h4:first-child{margin-top:0px;} hr{border:none;height:0px;border-bottom:dotted #303030 1px;} @@ -604,11 +603,21 @@ table.tabletip td{border-bottom:1px solid #ddd;} table.tabletip tbody tr:hover td{background-color:#eee;} table.colored{border-top:solid #d8b365 1px;border-bottom:solid #d8b365 1px;} -table.colored td,table.colored th{text-align:left;padding:5px;} +table.colored td,table.colored th{text-align:left;padding:5px;line-height:16px;} table.colored tr.header{background:#ebd9b2;background-image:url(form_title_bg.png);background-repeat:repeat-x;background-position:top;border-bottom:solid #d8b365 1px;font-weight:bold;} table.colored tr{background:#ffffff;} table.colored tr.odd_row{background:#dadfef;} div.debug{margin:10px;padding:5px;background:#FFFF99;border:solid #FFFF33 1px;color:black;} +.grid-header{padding-bottom:1em;} +.grid-header h2{margin:0;margin-bottom:0.5em;} +.grid-header .title{font-weight:bold;} +.grid{padding-top:1em;border-collapse:collapse;width:100%;} +.grid tbody td{line-height:16px;border-top:solid #DDDDDD 1px;border-bottom:solid #DDDDDD 1px;padding:0.3em 0.5em;} +.grid tbody td:empty{padding:0;} +.grid thead tr{height:2em;} +.grid thead th{line-height:16px;background:#ebd9b2;background-repeat:repeat-x;background-position:top;border-top:solid #d8b365 1px;border-bottom:solid #d8b365 1px;padding:0.3em 0.5em;text-align:left;white-space:nowrap;} +.grid tfoot td{background-color:#F8F8F8;border-top:solid #DDDDDD 1px;border-bottom:solid #DDDDDD 1px;padding:0.3em 0.5em;} +.grid .current{background-color:#EEEEFF;} div.odd_row{background:#dadfef;} #footer{display:none;} span.toolParameterExpandableCollapsable{font-weight:bold;cursor:pointer;} @@ -631,19 +640,17 @@ .state-fg-ok{color:#66AA66;} .state-fg-error{color:#AA6666;} .state-fg-deleted{color:#3399FF;} -button{display:inline-block;padding:4px 10px 4px;font-size:12px;line-height:16px;color:#333333;text-align:center;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#fafafa;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;*margin-left:.3em;}button:first-child{*margin-left:0;} -.action-button{display:inline-block;padding:4px 10px 4px;font-size:12px;line-height:16px;color:#333333;text-align:center;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#fafafa;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;*margin-left:.3em;}.action-button:first-child{*margin-left:0;} +button{display:inline-block;padding:4px 10px 4px;font-size:12px;line-height:16px;color:#333333;text-align:center;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#fafafa;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border:1px solid #999999;border-bottom-color:#888888;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;*margin-left:.3em;}button:first-child{*margin-left:0;} +.action-button{display:inline-block;padding:4px 10px 4px;font-size:12px;line-height:16px;color:#333333;text-align:center;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#fafafa;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border:1px solid #999999;border-bottom-color:#888888;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;*margin-left:.3em;}.action-button:first-child{*margin-left:0;} a.action-button{text-decoration:none;} .action-button>img{vertical-align:middle;} .action-button:hover{color:#333333;text-decoration:none;background-color:#e6e6e6;background-position:0 -15px;-webkit-transition:background-position 0.1s linear;-moz-transition:background-position 0.1s linear;-ms-transition:background-position 0.1s linear;-o-transition:background-position 0.1s linear;transition:background-position 0.1s linear;} -.action-button:active{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);background-color:#e6e6e6;background-color:#d9d9d9 \9;color:rgba(0, 0, 0, 0.5);outline:0;} -.menubutton{display:inline-block;padding:4px 10px 4px;font-size:12px;line-height:16px;color:#333333;text-align:center;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#fafafa;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;*margin-left:.3em;display:inline-block;cursor:pointer;position:relative;-webkit-user-select:none;-moz-user-select:none;-o-user-select:none;user-select:none;border:solid transparent 1px;-moz-border-radius:0.25em;-webkit-border-radius:0.25em;border-radius:0.25em;padding:1px 0.25em;margin:-1px -0.25em;}.menubutton:first-child{*margin-left:0;} -.menubutton .label{position:relative;display:block;border-right:none;} -.menubutton.action-button{border-color:#aaaaaa;} -.menubutton.popup,.action-button.popup{padding-right:20px;background-image:url(../images/dropdownarrow.png);background-repeat:no-repeat;background-position:right 7px;} -.menubutton:hover{border-color:#aaaaaa;} -.menubutton.popup.split{padding-right:2em;} -.menubutton.popup.split:hover{background:url(../images/ddarrowsplit.png) no-repeat right -39px;} +.action-button:active{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);background-color:#e6e6e6;background-color:#d9d9d9 \9;outline:0;} +.menubutton{display:inline-block;padding:4px 10px 4px;font-size:12px;line-height:16px;color:#333333;text-align:center;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#fafafa;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border:1px solid #999999;border-bottom-color:#888888;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;*margin-left:.3em;display:inline-block;cursor:pointer;position:relative;-webkit-user-select:none;-moz-user-select:none;-o-user-select:none;user-select:none;}.menubutton:first-child{*margin-left:0;} +.menubutton .label{position:relative;border-right:none;text-decoration:none;} +.menubutton.popup .label{border-right:solid #999999 1px;padding-right:6px;} +.menubutton.popup:after{margin-top:6px;display:inline-block;width:0;height:0;text-indent:-99999px;*text-indent:0;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #000000;opacity:0.3;filter:alpha(opacity=30);content:"\2193";} +.menubutton.popup.split:after{margin-top:6px;margin-left:0px;display:inline-block;width:0;height:0;text-indent:-99999px;*text-indent:0;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #000000;opacity:0.3;filter:alpha(opacity=30);content:"\2193";} div.popmenu-wrapper{position:absolute;top:100%;z-index:20000;}div.popmenu-wrapper ul.dropdown-menu{display:block;position:relative;float:none;} ul.dropdown-menu a{text-decoration:none;} ul.dropdown-menu li.head>a{text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);font-size:11px;font-weight:bold;line-height:16px;color:#999999;text-transform:uppercase;} @@ -651,16 +658,6 @@ .popup-arrow{cursor:pointer;text-decoration:none;color:#555;} .popup-arrow:hover{color:black;} div.permissionContainer{padding-left:20px;} -.grid-header{padding-bottom:1em;} -.grid-header h2{margin:0;margin-bottom:0.5em;} -.grid-header .title{font-weight:bold;} -.grid{padding-top:1em;border-collapse:collapse;width:100%;} -.grid tbody td{border-top:solid #DDDDDD 1px;border-bottom:solid #DDDDDD 1px;padding:0.3em 0.5em;} -.grid tbody td:empty{padding:0;} -.grid thead tr{height:2em;} -.grid thead th{background:#ebd9b2;background-repeat:repeat-x;background-position:top;border-top:solid #d8b365 1px;border-bottom:solid #d8b365 1px;padding:0.3em 0.5em;text-align:left;white-space:nowrap;} -.grid tfoot td{background-color:#F8F8F8;border-top:solid #DDDDDD 1px;border-bottom:solid #DDDDDD 1px;padding:0.3em 0.5em;} -.grid .current{background-color:#EEEEFF;} .text-content hr{display:block;background:black;color:black;width:100%;height:1px;border:none;background:#aaa;color:#aaa;} .text-content table{border-collapse:collapse;border-top:1px solid #ccc;border-left:1px solid #ccc;} .text-content blockquote{color:#666;} @@ -704,8 +701,7 @@ .icon-button.multiinput{background:url(../images/documents-stack.png) no-repeat;cursor:pointer;float:none;display:inline-block;margin-left:10px;} .icon-button.multiinput.disabled{background:url(../images/documents-stack-faded.png) no-repeat;cursor:auto;} .workflow-invocation-complete{border:solid 1px #6A6;border-left-width:5px;margin:10px 0;padding-left:5px;} -body.historyPage{background:#c1c9e5;color:#303030;margin:5px;border:0;padding:0;} -a{color:#303030;} +body.historyPage{background:#dfe5f9;color:#303030;margin:5px;border:0;padding:0;} div.historyLinks{margin:5px 5px;} div.historyItem{margin:0px -5px;padding:8px 10px;border-top:solid #999999 1px;border-right:none;word-wrap:break-word;background:#eeeeee;}div.historyItem .state-icon{display:inline-block;vertical-align:middle;width:16px;height:16px;background-position:0 1px;background-repeat:no-repeat;} div.historyItem .historyItemTitle{font-weight:bold;line-height:16px;} @@ -723,7 +719,7 @@ div.historyItemButtons{float:right;} div.historyItemBody div{padding-top:2px;} pre.peek{background:white;color:black;width:100%;overflow:auto;}pre.peek th{color:white;background:#023858;} -body.toolMenuPage{background:white;color:#303030;background:#c1c9e5;margin:5px;margin-right:10px;margin-left:10px;} +body.toolMenuPage{background:white;color:#303030;background:#dfe5f9;margin:5px;margin-right:10px;margin-left:10px;} hr{border:none;height:0px;margin-top:0px;} div.toolSectionWrapper{margin-bottom:5px;} div.toolSectionDetailsInner{margin-left:5px;margin-right:5px;} diff -r 65e36ccf037c427a053f3331e7e3aca08befe5e5 -r 93a4eeb167d9f9c355ef5372c5a07f1c6ece8494 static/june_2007_style/blue_colors.ini --- a/static/june_2007_style/blue_colors.ini +++ b/static/june_2007_style/blue_colors.ini @@ -4,7 +4,7 @@ link_text=#303030 header_text=#023858 #menu_bg_top=#DADFEF -menu_bg_over=#C1C9E5 +menu_bg_over=#DFE5F9 menu_bg_hatch=- #menu_bg_hatch=#AAAAFF # Forms diff -r 65e36ccf037c427a053f3331e7e3aca08befe5e5 -r 93a4eeb167d9f9c355ef5372c5a07f1c6ece8494 static/june_2007_style/bootstrap/buttons.less --- a/static/june_2007_style/bootstrap/buttons.less +++ b/static/june_2007_style/bootstrap/buttons.less @@ -15,8 +15,8 @@ text-align: center; text-shadow: 0 1px 1px rgba(255,255,255,.75); #gradient > .vertical-three-colors(@white, @white, 25%, darken(@white, 10%)); // Don't use .gradientbar() here since it does a three-color gradient - border: 1px solid #ccc; - border-bottom-color: #bbb; + border: 1px solid @buttonBorder; + border-bottom-color: @buttonBorderBottom; .border-radius(4px); @shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); .box-shadow(@shadow); @@ -52,7 +52,7 @@ .box-shadow(@shadow); background-color: darken(@white, 10%); background-color: darken(@white, 15%) e("\9"); - color: rgba(0,0,0,.5); + // color: rgba(0,0,0,.5); outline: 0; } diff -r 65e36ccf037c427a053f3331e7e3aca08befe5e5 -r 93a4eeb167d9f9c355ef5372c5a07f1c6ece8494 static/june_2007_style/galaxy_bootstrap.less --- a/static/june_2007_style/galaxy_bootstrap.less +++ b/static/june_2007_style/galaxy_bootstrap.less @@ -40,6 +40,9 @@ // Buttons @primaryButtonBackground: @linkColor; +@buttonBorder: #999; +@buttonBorderBottom: #888; + // Forms @formElementBorder: @grayLight; https://bitbucket.org/galaxy/galaxy-central/changeset/874b3006e35f/ changeset: 874b3006e35f user: james_taylor date: 2012-02-27 20:44:56 summary: style: restore underlined links affected #: 2 files diff -r 93a4eeb167d9f9c355ef5372c5a07f1c6ece8494 -r 874b3006e35f60e9ff4f47c1fc4fd8ad7136d7da static/june_2007_style/base.less --- a/static/june_2007_style/base.less +++ b/static/june_2007_style/base.less @@ -34,12 +34,11 @@ } -/* -a:link, a:visited, a:active { +a, a:link, a:visited, a:active { text-decoration: underline; color: @link_text; } -*/ + h1, h2, h3, h4 { color: @header_text; diff -r 93a4eeb167d9f9c355ef5372c5a07f1c6ece8494 -r 874b3006e35f60e9ff4f47c1fc4fd8ad7136d7da static/june_2007_style/blue/base.css --- a/static/june_2007_style/blue/base.css +++ b/static/june_2007_style/blue/base.css @@ -486,6 +486,7 @@ .clear:after{clear:both;} body{background:#ffffff;color:#303030;background-image:url(base_bg.png);background-repeat:repeat-x;background-position:top;margin:10px;} img{border:0;} +a,a:link,a:visited,a:active{text-decoration:underline;color:#303030;} h1,h2,h3,h4{color:#023858;margin:0.5em 0;} h1:first-child,h2:first-child,h3:first-child,h4:first-child{margin-top:0px;} hr{border:none;height:0px;border-bottom:dotted #303030 1px;} https://bitbucket.org/galaxy/galaxy-central/changeset/09daefc0ccba/ changeset: 09daefc0ccba user: james_taylor date: 2012-02-28 00:09:16 summary: style: fix panels in firefox, pretty search box affected #: 6 files diff -r 874b3006e35f60e9ff4f47c1fc4fd8ad7136d7da -r 09daefc0ccba2088234c8bfbd95fdcc20c0054b5 static/june_2007_style/Makefile --- a/static/june_2007_style/Makefile +++ b/static/june_2007_style/Makefile @@ -19,12 +19,12 @@ # Old style using process_css still works so we can move gradually %.css : %.css.tmpl - ../process_css.py ../$(INI) shared_images:../images $(OUT) < $< > $@ + ../process_css.py ../$(INI) ..:../shared_images:../../images . < $< > $@ # For building sprite images %.less : %.less.tmpl - ../process_css.py $(INI) shared_images:../images $(OUT) < $< > $@ + ../process_css.py ../$(INI) ..:../shared_images:../../images . < $< > $@ # Some dependencies -base.css: variables.less galaxy_bootstrap.less iconic_stroke.less +base.css: variables.less galaxy_bootstrap.less iconic_stroke.less base_sprites.less diff -r 874b3006e35f60e9ff4f47c1fc4fd8ad7136d7da -r 09daefc0ccba2088234c8bfbd95fdcc20c0054b5 static/june_2007_style/base.less --- a/static/june_2007_style/base.less +++ b/static/june_2007_style/base.less @@ -14,6 +14,11 @@ .box-shadow(); } +.parent-width { + .box-sizing(border-box); + width: 100%; +} + // ==== Real (basic) styles ==== .clear { @@ -183,7 +188,7 @@ color: #555; } - .drag, .collapse { + .drag { position: absolute; top: 0; right: 0; @@ -194,52 +199,49 @@ background-image: url(../images/visualization/draggable_horizontal.png); background-repeat: no-repeat; background-position: 50% 50%; - - // .ie7-restore-right-whitespace(); - } - - .drag { cursor: w-resize; } - - .collapse { - position: fixed; - left: 0; - top: inherit; - bottom: 0; - background: none; - border-right: solid @layout_border 1px; - border-top: solid @layout_border 1px; - #gradient > .vertical-three-colors(darken(@white, 5%), darken(@white, 5%), 25%, darken(@white, 10%)); - .iconic(); - - } - .collapse.hidden { - // .opacity(50); - } - .collapse:before { - content:'\2190'; - } - .collapse.hidden:before { - content:'\2192'; - } } #right > .unified-panel-footer { .drag { left: 0; } - .collapse { +} + +// Needs to be outside panel to show when hidden +.panel-collapse { + .unified-panel-footer(); + z-index: 10000; + position: fixed; + left: 0; + top: inherit; + bottom: 0; + padding: 0 5px; + text-align: center; + width: @panel_footer_height - 5; + background: none; + border-right: solid @layout_border 1px; + border-top: solid @layout_border 1px; + #gradient > .vertical-three-colors(darken(@white, 5%), darken(@white, 5%), 25%, darken(@white, 10%)); + .iconic(); + &:before { + content:'\2190'; + } + &.hidden:before { + content:'\2192'; + } + &.right { left: inherit; right: 0; border-right: none; border-left: solid @layout_border 1px; - } - .collapse:before{ - content:'\2192'; - } - .collapse.hidden:before { - content:'\2190'; + &.right:before{ + content:'\2192'; + } + &.right.hidden:before { + content:'\2190'; + } } } @@ -669,11 +671,8 @@ max-width: 300px; } -/* .search-query { display: inline-block; - width: 210px; - height: @baseLineHeight; padding: 4px; margin-bottom: 9px; font-size: @baseFontSize; @@ -684,8 +683,22 @@ padding-right: 14px; margin-bottom: 0; // remove the default margin on all inputs .border-radius(14px); + max-width: auto; } -*/ +.search-query:focus { + border-color: rgba(82,168,236,.8); + @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); + .box-shadow(@shadow); + outline: 0; + outline: thin dotted \9; /* IE6-8 */ +} + +.search-spinner { + position: absolute; + display: none; + right: 8px; + top: 10px; +} // Messages @@ -889,7 +902,7 @@ line-height: @baseLineHeight; border-top: solid #DDDDDD 1px; border-bottom: solid #DDDDDD 1px; - padding: 0.3em 0.5em; + padding: 5px; } .grid tbody td:empty { padding: 0; @@ -905,7 +918,7 @@ background-position: top; border-top: solid @table_border 1px; border-bottom: solid @table_border 1px; - padding: 0.3em 0.5em; + padding: 5px; text-align: left; white-space: nowrap; } @@ -913,7 +926,7 @@ background-color: #F8F8F8; border-top: solid #DDDDDD 1px; border-bottom: solid #DDDDDD 1px; - padding: 0.3em 0.5em; + padding: 5px; } .grid .current { background-color: #EEEEFF; @@ -1503,7 +1516,6 @@ margin-top: 0px; } -/* div.toolSectionPad { margin: 0; @@ -1511,10 +1523,9 @@ height: 5px; font-size: 0px; } -*/ div.toolSectionWrapper { - margin-bottom: 5px; + // margin-bottom: 5px; } div.toolSectionDetailsInner diff -r 874b3006e35f60e9ff4f47c1fc4fd8ad7136d7da -r 09daefc0ccba2088234c8bfbd95fdcc20c0054b5 static/june_2007_style/blue/base.css --- a/static/june_2007_style/blue/base.css +++ b/static/june_2007_style/blue/base.css @@ -482,6 +482,7 @@ .iconic.spin_alt:before{content:'\e037';} .unselectable{-webkit-user-select:none;-moz-user-select:none;-o-user-select:none;user-select:none;} .shadow{-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25);} +.parent-width{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;width:100%;} .clear{*zoom:1;}.clear:before,.clear:after{display:table;content:"";} .clear:after{clear:both;} body{background:#ffffff;color:#303030;background-image:url(base_bg.png);background-repeat:repeat-x;background-position:top;margin:10px;} @@ -504,15 +505,14 @@ .unified-panel-header{-webkit-user-select:none;-moz-user-select:none;-o-user-select:none;user-select:none;height:30px;z-index:1000;text-shadow:rgba(255, 255, 255, 0.8) 0 1px 0;background-color:#fafafa;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border-bottom:solid #999999 1px;margin:0;padding:0;padding-right:10px;padding-left:10px;font-weight:bold;color:#555;}.unified-panel-header a{color:#555;} .unified-panel-header-inner{padding-top:8px;} .unified-panel-footer{-webkit-user-select:none;-moz-user-select:none;-o-user-select:none;user-select:none;position:absolute;bottom:0;height:25px;line-height:25px;width:100%;z-index:1000;border-top:solid #999999 1px;background-color:#f0f0f0;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), color-stop(25%, #f2f2f2), to(#e6e6e6));background-image:-webkit-linear-gradient(#f2f2f2, #f2f2f2 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #f2f2f2, #f2f2f2 25%, #e6e6e6);background-image:-ms-linear-gradient(#f2f2f2, #f2f2f2 25%, #e6e6e6);background-image:-o-linear-gradient(#f2f2f2, #f2f2f2 25%, #e6e6e6);background-image:linear-gradient(#f2f2f2, #f2f2f2 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f2f2f2', endColorstr='#e6e6e6', GradientType=0);color:#555;}.unified-panel-footer a{color:#555;} -.unified-panel-footer .drag,.unified-panel-footer .collapse{position:absolute;top:0;right:0;padding:0 5px;text-align:center;height:25px;width:20px;background-image:url(../images/visualization/draggable_horizontal.png);background-repeat:no-repeat;background-position:50% 50%;} -.unified-panel-footer .drag{cursor:w-resize;} -.unified-panel-footer .collapse{position:fixed;left:0;top:inherit;bottom:0;background:none;border-right:solid #999999 1px;border-top:solid #999999 1px;background-color:#f0f0f0;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), color-stop(25%, #f2f2f2), to(#e6e6e6));background-image:-webkit-linear-gradient(#f2f2f2, #f2f2f2 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #f2f2f2, #f2f2f2 25%, #e6e6e6);background-image:-ms-linear-gradient(#f2f2f2, #f2f2f2 25%, #e6e6e6);background-image:-o-linear-gradient(#f2f2f2, #f2f2f2 25%, #e6e6e6);background-image:linear-gradient(#f2f2f2, #f2f2f2 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f2f2f2', endColorstr='#e6e6e6', GradientType=0);display:inline-block;font-family:'IconicStroke';} -.unified-panel-footer .collapse:before{content:'\2190';} -.unified-panel-footer .collapse.hidden:before{content:'\2192';} +.unified-panel-footer .drag{position:absolute;top:0;right:0;padding:0 5px;text-align:center;height:25px;width:20px;background-image:url(../images/visualization/draggable_horizontal.png);background-repeat:no-repeat;background-position:50% 50%;cursor:w-resize;} #right>.unified-panel-footer .drag{left:0;} -#right>.unified-panel-footer .collapse{left:inherit;right:0;border-right:none;border-left:solid #999999 1px;} -#right>.unified-panel-footer .collapse:before{content:'\2192';} -#right>.unified-panel-footer .collapse.hidden:before{content:'\2190';} +.panel-collapse{-webkit-user-select:none;-moz-user-select:none;-o-user-select:none;user-select:none;position:absolute;bottom:0;height:25px;line-height:25px;width:100%;z-index:1000;border-top:solid #999999 1px;background-color:#f0f0f0;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), color-stop(25%, #f2f2f2), to(#e6e6e6));background-image:-webkit-linear-gradient(#f2f2f2, #f2f2f2 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #f2f2f2, #f2f2f2 25%, #e6e6e6);background-image:-ms-linear-gradient(#f2f2f2, #f2f2f2 25%, #e6e6e6);background-image:-o-linear-gradient(#f2f2f2, #f2f2f2 25%, #e6e6e6);background-image:linear-gradient(#f2f2f2, #f2f2f2 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f2f2f2', endColorstr='#e6e6e6', GradientType=0);color:#555;z-index:10000;position:fixed;left:0;top:inherit;bottom:0;padding:0 5px;text-align:center;width:20px;background:none;border-right:solid #999999 1px;border-top:solid #999999 1px;background-color:#f0f0f0;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), color-stop(25%, #f2f2f2), to(#e6e6e6));background-image:-webkit-linear-gradient(#f2f2f2, #f2f2f2 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #f2f2f2, #f2f2f2 25%, #e6e6e6);background-image:-ms-linear-gradient(#f2f2f2, #f2f2f2 25%, #e6e6e6);background-image:-o-linear-gradient(#f2f2f2, #f2f2f2 25%, #e6e6e6);background-image:linear-gradient(#f2f2f2, #f2f2f2 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f2f2f2', endColorstr='#e6e6e6', GradientType=0);display:inline-block;font-family:'IconicStroke';}.panel-collapse a{color:#555;} +.panel-collapse .drag{position:absolute;top:0;right:0;padding:0 5px;text-align:center;height:25px;width:20px;background-image:url(../images/visualization/draggable_horizontal.png);background-repeat:no-repeat;background-position:50% 50%;cursor:w-resize;} +.panel-collapse:before{content:'\2190';} +.panel-collapse.hidden:before{content:'\2192';} +.panel-collapse.right{left:inherit;right:0;border-right:none;border-left:solid #999999 1px;}.panel-collapse.right.right:before{content:'\2192';} +.panel-collapse.right.right.hidden:before{content:'\2190';} .menu-bg{background:whiteSmoke top repeat-x;} div.unified-panel-body{position:absolute;top:30px;bottom:0;width:100%;margin-top:1px;} #left>div.unified-panel-body,#right>div.unified-panel-body{bottom:25px;} @@ -580,6 +580,9 @@ .form-row .help{color:#666;} select,input,textarea{font:inherit;} select,textarea,input[type="text"],input[type="file"],input[type="password"]{max-width:300px;} +.search-query{display:inline-block;padding:4px;margin-bottom:9px;font-size:12px;line-height:16px;color:#555555;border:1px solid #999999;padding-left:14px;padding-right:14px;margin-bottom:0;-webkit-border-radius:14px;-moz-border-radius:14px;border-radius:14px;max-width:auto;} +.search-query:focus{border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);outline:0;outline:thin dotted \9;} +.search-spinner{position:absolute;display:none;right:8px;top:10px;} .errormessagelarge,.warningmessagelarge,.donemessagelarge,.infomessagelarge{padding:8px 35px 8px 14px;margin-bottom:16px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#ffffcc;border:1px solid #ffdd33;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;color:#666600;min-height:32px;padding-left:52px;background-image:url(error_message_icon.png);background-repeat:no-repeat;background-position:10px 10px;} .errormessagelarge{background-color:#ffcccc;border-color:#ff3355;color:#660000;padding-left:52px;} .warningmessagelarge{background-image:url(warn_message_icon.png);border-color:#aaaa66;background-color:#ffffcc;} @@ -613,11 +616,11 @@ .grid-header h2{margin:0;margin-bottom:0.5em;} .grid-header .title{font-weight:bold;} .grid{padding-top:1em;border-collapse:collapse;width:100%;} -.grid tbody td{line-height:16px;border-top:solid #DDDDDD 1px;border-bottom:solid #DDDDDD 1px;padding:0.3em 0.5em;} +.grid tbody td{line-height:16px;border-top:solid #DDDDDD 1px;border-bottom:solid #DDDDDD 1px;padding:5px;} .grid tbody td:empty{padding:0;} .grid thead tr{height:2em;} -.grid thead th{line-height:16px;background:#ebd9b2;background-repeat:repeat-x;background-position:top;border-top:solid #d8b365 1px;border-bottom:solid #d8b365 1px;padding:0.3em 0.5em;text-align:left;white-space:nowrap;} -.grid tfoot td{background-color:#F8F8F8;border-top:solid #DDDDDD 1px;border-bottom:solid #DDDDDD 1px;padding:0.3em 0.5em;} +.grid thead th{line-height:16px;background:#ebd9b2;background-repeat:repeat-x;background-position:top;border-top:solid #d8b365 1px;border-bottom:solid #d8b365 1px;padding:5px;text-align:left;white-space:nowrap;} +.grid tfoot td{background-color:#F8F8F8;border-top:solid #DDDDDD 1px;border-bottom:solid #DDDDDD 1px;padding:5px;} .grid .current{background-color:#EEEEFF;} div.odd_row{background:#dadfef;} #footer{display:none;} @@ -722,7 +725,7 @@ pre.peek{background:white;color:black;width:100%;overflow:auto;}pre.peek th{color:white;background:#023858;} body.toolMenuPage{background:white;color:#303030;background:#dfe5f9;margin:5px;margin-right:10px;margin-left:10px;} hr{border:none;height:0px;margin-top:0px;} -div.toolSectionWrapper{margin-bottom:5px;} +div.toolSectionPad{margin:0;padding:0;height:5px;font-size:0px;} div.toolSectionDetailsInner{margin-left:5px;margin-right:5px;} div.toolSectionTitle{font-weight:bold;} div.toolPanelLabel{font-weight:bold;color:gray;text-transform:uppercase;} diff -r 874b3006e35f60e9ff4f47c1fc4fd8ad7136d7da -r 09daefc0ccba2088234c8bfbd95fdcc20c0054b5 static/scripts/galaxy.panels.js --- a/static/scripts/galaxy.panels.js +++ b/static/scripts/galaxy.panels.js @@ -18,10 +18,10 @@ MAX_PANEL_WIDTH = 800; var Panel = function( options ) { - this.panel = options.panel; - this.center = options.center; - this.drag = options.drag; - this.toggle = options.toggle; + this.$panel = options.panel; + this.$center = options.center; + this.$drag = options.drag; + this.$toggle = options.toggle; this.left = !options.right; this.hidden = false; this.hidden_by_tool = false; @@ -30,11 +30,11 @@ } $.extend( Panel.prototype, { resize: function( x ) { - $(this.panel).css( "width", x ); + this.$panel.css( "width", x ); if ( this.left ) { - $(center).css( "left", x ); + this.$center.css( "left", x ); } else { - $(center).css( "right", x ); + this.$center.css( "right", x ); } // ie7-recalc.js if ( document.recalc ) { document.recalc(); } @@ -42,44 +42,40 @@ do_toggle: function() { var self = this; if ( this.hidden ) { - $(this.toggle).removeClass( "hidden" ); + this.$toggle.removeClass( "hidden" ); if ( this.left ) { - $(this.panel).css( "left", - this.saved_size ).show().animate( { "left": 0 }, "fast", function () { + this.$panel.css( "left", - this.saved_size ).show().animate( { "left": 0 }, "fast", function () { self.resize( self.saved_size ); }); } else { - $(this.panel).css( "right", - this.saved_size ).show().animate( { "right": 0 }, "fast", function () { + this.$panel.css( "right", - this.saved_size ).show().animate( { "right": 0 }, "fast", function () { self.resize( self.saved_size ); }); } self.hidden = false; } else { - self.saved_size = $(this.panel).width(); - // Move center - - // $( center_el ).css( "right", $(border_el).innerWidth() + 1 ); - + self.saved_size = this.$panel.width(); if ( document.recalc ) { document.recalc(); } // Hide border if ( this.left ) { - $(this.panel).animate( { left: - this.saved_size }, "fast" ); + this.$panel.animate( { left: - this.saved_size }, "fast" ); } else { - $(this.panel).animate( { right: - this.saved_size }, "fast" ); + this.$panel.animate( { right: - this.saved_size }, "fast" ); } // self.resize(0); if ( this.left ) { - $(center).css( "left", 0 ); + this.$center.css( "left", 0 ); } else { - $(center).css( "right", 0 ); + this.$center.css( "right", 0 ); } self.hidden = true; - $(self.toggle).addClass( "hidden" ); + self.$toggle.addClass( "hidden" ); } this.hidden_by_tool = false; }, handle_minwidth_hint: function( x ) { - var space = $(this.center).width() - ( this.hidden ? this.saved_size : 0 ); + var space = this.$center.width() - ( this.hidden ? this.saved_size : 0 ); if ( space < x ) { if ( ! this.hidden ) { @@ -100,10 +96,12 @@ }, init: function() { var self = this; + // Pull the collapse element out to body level so it is visible when panel is hidden + this.$toggle.remove().appendTo( "body" ); // Resizing using drag element - $(this.drag).on( "dragstart", function( e, d ) { + this.$drag.on( "dragstart", function( e, d ) { $( '#DD-helper' ).show(); - d.width = $(self.panel).width(); + d.width = self.$panel.width(); }).on( "dragend", function() { $( '#DD-helper' ).hide(); }).on( "drag", function( e, d ) { @@ -118,7 +116,7 @@ self.resize( x ); }); // Hide/show using toggle element - $(self.toggle).on( "click", function() { self.do_toggle(); } ); + self.$toggle.on( "click", function() { self.do_toggle(); } ); } }); diff -r 874b3006e35f60e9ff4f47c1fc4fd8ad7136d7da -r 09daefc0ccba2088234c8bfbd95fdcc20c0054b5 templates/base_panels.mako --- a/templates/base_panels.mako +++ b/templates/base_panels.mako @@ -64,12 +64,12 @@ ensure_dd_helper(); %if self.has_left_panel: - var lp = new Panel( { panel: $("#left"), center: $("#center"), drag: $("#left > .unified-panel-footer > .drag" ), toggle: $("#left > .unified-panel-footer > .collapse" ) } ); + var lp = new Panel( { panel: $("#left"), center: $("#center"), drag: $("#left > .unified-panel-footer > .drag" ), toggle: $("#left > .unified-panel-footer > .panel-collapse" ) } ); force_left_panel = lp.force_panel; %endif %if self.has_right_panel: - var rp = new Panel( { panel: $("#right"), center: $("#center"), drag: $("#right > .unified-panel-footer > .drag" ), toggle: $("#right > .unified-panel-footer > .collapse" ), right: true } ); + var rp = new Panel( { panel: $("#right"), center: $("#center"), drag: $("#right > .unified-panel-footer > .drag" ), toggle: $("#right > .unified-panel-footer > .panel-collapse" ), right: true } ); window.handle_minwidth_hint = function( x ) { console.log( "hint", x ); rp.handle_minwidth_hint( x ) }; force_right_panel = function( x ) { rp.force_panel( x ) }; %endif @@ -168,7 +168,7 @@ <% if visible: - display = "" + display = "style='display: block;'" overlay_class = "in" else: display = "style='display: none;'" @@ -177,7 +177,7 @@ <div id="overlay" ${display}> - <div id="overlay-background" class="modal-backdrop fade $overlay_class"></div> + <div id="overlay-background" class="modal-backdrop fade ${overlay_class}"></div><div id="dialog-box" class="modal" border="0" ${display}><div class="modal-header"> @@ -229,7 +229,7 @@ <div id="left"> ${self.left_panel()} <div class="unified-panel-footer"> - <div class="collapse"></span></div> + <div class="panel-collapse"></span></div><div class="drag"></div></div></div> @@ -241,7 +241,7 @@ <div id="right"> ${self.right_panel()} <div class="unified-panel-footer"> - <div class="collapse"></span></div> + <div class="panel-collapse right"></span></div><div class="drag"></div></div></div> diff -r 874b3006e35f60e9ff4f47c1fc4fd8ad7136d7da -r 09daefc0ccba2088234c8bfbd95fdcc20c0054b5 templates/root/tool_menu.mako --- a/templates/root/tool_menu.mako +++ b/templates/root/tool_menu.mako @@ -321,13 +321,13 @@ else: display = "none" %> - <div id="tool-search" class="bar" style="margin: -6px -10px 10px -10px; padding: 5px 10px; position: relative; display: ${display};"> + <div id="tool-search" class="bar" style="padding-top: 5px; padding-bottom: 10px;position: relative; display: ${display};"> %if trans.app.config.get_bool( 'enable_tool_tags', False ): <b>Tags:</b> ${render_tool_tagging_elements()} %endif - <input type="text" name="query" value="search tools" id="tool-search-query" autocomplete="off" class="search-query" style="width: 90%"/> - <img src="${h.url_for('/static/images/loading_small_white_bg.gif')}" id="search-spinner" style="display: none; position: absolute; right: 0; top: 5px;"/> + <input type="text" name="query" value="search tools" id="tool-search-query" autocomplete="off" class="search-query parent-width" /> + <img src="${h.url_for('/static/images/loading_small_white_bg.gif')}" id="search-spinner" class="search-spinner"/></div> ## Recently used tools. https://bitbucket.org/galaxy/galaxy-central/changeset/31937c331c4d/ changeset: 31937c331c4d user: james_taylor date: 2012-03-05 19:48:46 summary: style: less file for iconic font affected #: 1 file diff -r 09daefc0ccba2088234c8bfbd95fdcc20c0054b5 -r 31937c331c4d4fc04e1d4436906411e458228d9e static/june_2007_style/iconic_stroke.less --- /dev/null +++ b/static/june_2007_style/iconic_stroke.less @@ -0,0 +1,461 @@ +@font-face { + font-family: 'IconicStroke'; + src: url('../images/fonts/iconic_stroke.eot'); + src: url('../images/fonts/iconic_stroke.eot?#iefix') format('embedded-opentype'), url('../images/fonts/iconic_stroke.ttf') format('truetype'), url('../images/fonts/iconic_stroke.svg#iconic') format('svg'); + font-weight: normal; + font-style: normal; +} +.iconic { + display: inline-block; + font-family: 'IconicStroke'; +} +.iconic.lightbulb:before { + content: '\e063'; +} +.iconic.equalizer:before { + content: '\e052'; +} +.iconic.map_pin_stroke:before { + content: '\e068'; +} +.iconic.brush_alt:before { + content: '\e01c'; +} +.iconic.move:before { + content: '\e03e'; +} +.iconic.pen_alt_stroke:before { + content: '\e005'; +} +.iconic.move_vertical:before { + content: '\e03b'; +} +.iconic.book_alt2:before { + content: '\e06a'; +} +.iconic.layers:before { + content: '\e01f'; +} +.iconic.pause:before { + content: '\e049'; +} +.iconic.layers_alt:before { + content: '\e020'; +} +.iconic.cloud_upload:before { + content: '\e045'; +} +.iconic.chart_alt:before { + content: '\e029'; +} +.iconic.fullscreen_exit_alt:before { + content: '\e051'; +} +.iconic.cloud_download:before { + content: '\e044'; +} +.iconic.comment_alt2_stroke:before { + content: '\e004'; +} +.iconic.mail:before { + content: '\2709'; +} +.iconic.check_alt:before { + content: '\2718'; +} +.iconic.document_stroke:before { + content: '\e066'; +} +.iconic.battery_charging:before { + content: '\e05d'; +} +.iconic.stop:before { + content: '\e04a'; +} +.iconic.arrow_up:before { + content: '\2191'; +} +.iconic.move_horizontal:before { + content: '\e038'; +} +.iconic.compass:before { + content: '\e021'; +} +.iconic.minus_alt:before { + content: '\e009'; +} +.iconic.battery_empty:before { + content: '\e05c'; +} +.iconic.map_pin_alt:before { + content: '\e002'; +} +.iconic.unlock_stroke:before { + content: '\e076'; +} +.iconic.lock_stroke:before { + content: '\e075'; +} +.iconic.question_mark:before { + content: '\003f'; +} +.iconic.list:before { + content: '\e055'; +} +.iconic.upload:before { + content: '\e043'; +} +.iconic.reload:before { + content: '\e030'; +} +.iconic.loop_alt4:before { + content: '\e035'; +} +.iconic.loop_alt3:before { + content: '\e034'; +} +.iconic.loop_alt2:before { + content: '\e033'; +} +.iconic.loop_alt1:before { + content: '\e032'; +} +.iconic.left_quote:before { + content: '\275d'; +} +.iconic.x:before { + content: '\2713'; +} +.iconic.last:before { + content: '\e04d'; +} +.iconic.document_alt_stroke:before { + content: '\e000'; +} +.iconic.bars:before { + content: '\e06f'; +} +.iconic.arrow_left:before { + content: '\2190'; +} +.iconic.arrow_down:before { + content: '\2193'; +} +.iconic.download:before { + content: '\e042'; +} +.iconic.home:before { + content: '\2302'; +} +.iconic.calendar:before { + content: '\e001'; +} +.iconic.right_quote_alt:before { + content: '\e012'; +} +.iconic.fullscreen:before { + content: '\e04e'; +} +.iconic.dial:before { + content: '\e058'; +} +.iconic.plus_alt:before { + content: '\e008'; +} +.iconic.clock:before { + content: '\e079'; +} +.iconic.movie:before { + content: '\e060'; +} +.iconic.steering_wheel:before { + content: '\e024'; +} +.iconic.pen:before { + content: '\270e'; +} +.iconic.tag_stroke:before { + content: '\e02b'; +} +.iconic.pin:before { + content: '\e067'; +} +.iconic.denied:before { + content: '\26d4'; +} +.iconic.left_quote_alt:before { + content: '\e011'; +} +.iconic.volume_mute:before { + content: '\e071'; +} +.iconic.arrow_up_alt2:before { + content: '\e018'; +} +.iconic.list_nested:before { + content: '\e056'; +} +.iconic.arrow_up_alt1:before { + content: '\e014'; +} +.iconic.comment_stroke:before { + content: '\e06d'; +} +.iconic.undo:before { + content: '\e02f'; +} +.iconic.umbrella:before { + content: '\2602'; +} +.iconic.bolt:before { + content: '\26a1'; +} +.iconic.article:before { + content: '\e053'; +} +.iconic.read_more:before { + content: '\e054'; +} +.iconic.beaker:before { + content: '\e023'; +} +.iconic.beaker_alt:before { + content: '\e010'; +} +.iconic.battery_full:before { + content: '\e073'; +} +.iconic.arrow_right:before { + content: '\2192'; +} +.iconic.new_window:before { + content: '\e059'; +} +.iconic.plus:before { + content: '\2795'; +} +.iconic.cog:before { + content: '\2699'; +} +.iconic.key_stroke:before { + content: '\26bf'; +} +.iconic.first:before { + content: '\e04c'; +} +.iconic.comment_alt1_stroke:before { + content: '\e003'; +} +.iconic.trash_stroke:before { + content: '\e05a'; +} +.iconic.image:before { + content: '\e027'; +} +.iconic.chat_alt_stroke:before { + content: '\e007'; +} +.iconic.cd:before { + content: '\e064'; +} +.iconic.right_quote:before { + content: '\275e'; +} +.iconic.brush:before { + content: '\e01b'; +} +.iconic.cloud:before { + content: '\2601'; +} +.iconic.eye:before { + content: '\e025'; +} +.iconic.play_alt:before { + content: '\e048'; +} +.iconic.transfer:before { + content: '\e041'; +} +.iconic.pen_alt2:before { + content: '\e006'; +} +.iconic.camera:before { + content: '\e070'; +} +.iconic.move_horizontal_alt2:before { + content: '\e03a'; +} +.iconic.curved_arrow:before { + content: '\2935'; +} +.iconic.move_horizontal_alt1:before { + content: '\e039'; +} +.iconic.aperture:before { + content: '\e026'; +} +.iconic.reload_alt:before { + content: '\e031'; +} +.iconic.magnifying_glass:before { + content: '\e074'; +} +.iconic.iphone:before { + content: '\e06e'; +} +.iconic.fork:before { + content: '\e046'; +} +.iconic.box:before { + content: '\e06b'; +} +.iconic.bars_alt:before { + content: '\e00a'; +} +.iconic.heart_stroke:before { + content: '\2764'; +} +.iconic.volume:before { + content: '\e072'; +} +.iconic.x_alt:before { + content: '\2714'; +} +.iconic.link:before { + content: '\e077'; +} +.iconic.moon_stroke:before { + content: '\263e'; +} +.iconic.eyedropper:before { + content: '\e01e'; +} +.iconic.spin:before { + content: '\e036'; +} +.iconic.rss:before { + content: '\e02c'; +} +.iconic.info:before { + content: '\2139'; +} +.iconic.target:before { + content: '\e02a'; +} +.iconic.cursor:before { + content: '\e057'; +} +.iconic.minus:before { + content: '\2796'; +} +.iconic.book_alt:before { + content: '\e00b'; +} +.iconic.headphones:before { + content: '\e061'; +} +.iconic.hash:before { + content: '\0023'; +} +.iconic.arrow_left_alt1:before { + content: '\e013'; +} +.iconic.arrow_left_alt2:before { + content: '\e017'; +} +.iconic.fullscreen_exit:before { + content: '\e050'; +} +.iconic.share:before { + content: '\e02e'; +} +.iconic.fullscreen_alt:before { + content: '\e04f'; +} +.iconic.at:before { + content: '\0040'; +} +.iconic.chat:before { + content: '\e05e'; +} +.iconic.move_vertical_alt2:before { + content: '\e03d'; +} +.iconic.move_vertical_alt1:before { + content: '\e03c'; +} +.iconic.check:before { + content: '\2717'; +} +.iconic.mic:before { + content: '\e05f'; +} +.iconic.calendar_alt_stroke:before { + content: '\e06c'; +} +.iconic.book:before { + content: '\e069'; +} +.iconic.move_alt1:before { + content: '\e03f'; +} +.iconic.move_alt2:before { + content: '\e040'; +} +.iconic.award_stroke:before { + content: '\e022'; +} +.iconic.wrench:before { + content: '\e078'; +} +.iconic.play:before { + content: '\e047'; +} +.iconic.star:before { + content: '\2605'; +} +.iconic.chart:before { + content: '\e028'; +} +.iconic.rain:before { + content: '\26c6'; +} +.iconic.folder_stroke:before { + content: '\e065'; +} +.iconic.sun_stroke:before { + content: '\2600'; +} +.iconic.user:before { + content: '\e062'; +} +.iconic.battery_half:before { + content: '\e05b'; +} +.iconic.aperture_alt:before { + content: '\e00c'; +} +.iconic.eject:before { + content: '\e04b'; +} +.iconic.arrow_down_alt1:before { + content: '\e016'; +} +.iconic.pilcrow:before { + content: '\00b6'; +} +.iconic.arrow_down_alt2:before { + content: '\e01a'; +} +.iconic.arrow_right_alt1:before { + content: '\e015'; +} +.iconic.arrow_right_alt2:before { + content: '\e019'; +} +.iconic.rss_alt:before { + content: '\e02d'; +} +.iconic.spin_alt:before { + content: '\e037'; +} https://bitbucket.org/galaxy/galaxy-central/changeset/78bf0820161f/ changeset: 78bf0820161f user: james_taylor date: 2012-03-05 19:57:30 summary: style: updating make_style.py to call make, removing scripts that are no longer used affected #: 4 files diff -r 31937c331c4d4fc04e1d4436906411e458228d9e -r 78bf0820161fdf30cd65fc54a804b778a08f032e static/june_2007_style/callout_top.py --- a/static/june_2007_style/callout_top.py +++ /dev/null @@ -1,55 +0,0 @@ -#!/usr/bin/env python - -""" -usage: %prog width height bg_color hatch_color [color alpha stop_pos] + -""" - -from __future__ import division - -import sys -import cairo - -assert sys.version_info[:2] >= ( 2, 4 ) - -def parse_css_color( color ): - if color.startswith( '#' ): - color = color[1:] - if len( color ) == 3: - r = int( color[0]*2, 16 ) - g = int( color[1]*2, 16 ) - b = int( color[2]*2, 16 ) - elif len( color ) == 6: - r = int( color[0:2], 16 ) - g = int( color[2:4], 16 ) - b = int( color[4:6], 16 ) - else: - raise Exception( "Color should be 3 hex numbers" ) - return r/256, g/256, b/256 - -width = int( sys.argv[1] ) -height = int( sys.argv[2] ) - -surface = cairo.ImageSurface( cairo.FORMAT_ARGB32, width, height ) -c = cairo.Context( surface ) - -height -= 1 -width -= 1 - -hw = width / 2 - -c.set_line_width( 1 ) - -def t( x ): return x + 0.5 - -c.move_to( t( 0 ), t( height+2 ) ) -c.line_to( t( hw ), t( 0 ) ) -c.line_to( t( width ), t( height+2 ) ) -c.close_path() - -c.set_source_rgb( *parse_css_color( sys.argv[3] ) ) -c.fill_preserve() - -c.set_source_rgb( *parse_css_color( sys.argv[4] ) ) -c.stroke() - -surface.write_to_png( "/dev/stdout" ) diff -r 31937c331c4d4fc04e1d4436906411e458228d9e -r 78bf0820161fdf30cd65fc54a804b778a08f032e static/june_2007_style/gradient.py --- a/static/june_2007_style/gradient.py +++ /dev/null @@ -1,74 +0,0 @@ -#!/usr/bin/env python - -""" -usage: %prog width height bg_color hatch_color [color alpha stop_pos] + -""" - -from __future__ import division - -import sys -import cairo - -assert sys.version_info[:2] >= ( 2, 4 ) - -def parse_css_color( color ): - if color.startswith( '#' ): - color = color[1:] - if len( color ) == 3: - r = int( color[0], 16 ) - g = int( color[1], 16 ) - b = int( color[2], 16 ) - elif len( color ) == 6: - r = int( color[0:2], 16 ) - g = int( color[2:4], 16 ) - b = int( color[4:6], 16 ) - else: - raise Exception( "Color should be 3 hex numbers" ) - return r/256, g/256, b/256 - -def gradient( width, height, args ): - pat = cairo.LinearGradient(0.0, 0.0, 0.0, height) - while len( args ) > 2: - col = parse_css_color( args[0] ) - alpha = float( args[1]) - pos = float( args[2] ) - pat.add_color_stop_rgba( pos, col[0], col[1], col[2], alpha ) - args = args[3:] - return pat - -def hatch( width, height, color ): - im_surf = cairo.ImageSurface( cairo.FORMAT_ARGB32, width, width ) - c = cairo.Context( im_surf ) - c.set_source_rgb ( *color ) - c.set_line_width( 0.75 ) - for i in range( 0, 2*max(height,width), 3 ): - c.move_to ( 0-10, i+10 ) - c.line_to ( width+10, i - width - 10 ) - c.stroke() - pat = cairo.SurfacePattern( im_surf ) - pat.set_extend (cairo.EXTEND_REPEAT) - return pat - -width = int( sys.argv[1] ) -height = int( sys.argv[2] ) - -surface = cairo.ImageSurface( cairo.FORMAT_ARGB32, width, height ) -c = cairo.Context( surface ) - -c.rectangle(0,0,width,height) -c.set_source_rgb( *parse_css_color( sys.argv[3] ) ) -c.fill() - -if sys.argv[4] != "-": - c.rectangle (0, 0, width, height) - c.set_source( hatch( width, height, parse_css_color( sys.argv[4] ) ) ) - c.fill() - -pat = cairo.LinearGradient(0.0, 0.0, 0.0, height) -pat.add_color_stop_rgba( 0, 1, 1, 1, 0 ) -pat.add_color_stop_rgba( 1, 1, 1, 1, 1 ) -c.rectangle (0, 0, width, height) -c.set_source( gradient( width, height, sys.argv[5:] ) ) -c.fill() - -surface.write_to_png( "/dev/stdout" ) diff -r 31937c331c4d4fc04e1d4436906411e458228d9e -r 78bf0820161fdf30cd65fc54a804b778a08f032e static/june_2007_style/make_style.py --- a/static/june_2007_style/make_style.py +++ b/static/june_2007_style/make_style.py @@ -1,83 +1,17 @@ #!/usr/bin/env python -import sys, string, os, tempfile, subprocess +import sys, os -# from Cheetah.Template import Template -from subprocess import Popen, PIPE +ini_file, out_dir = "blue_colors.ini", "blue" +if len(sys.argv) > 1: + ini_file, out_dir = sys.argv[1:] -assert sys.version_info[:2] >= ( 2, 4 ) +cmd = "make INI=%s OUT=%s" % ( ini_file, out_dir ) -# To create a new style ( this is an example ): -# In case you have not yet installed required packages: -# % sudo easy_install pyparsing -# % sudo easy_install http://effbot.org/downloads/Imaging-1.1.7.tar.gz -# When you have the above installed, add whatever new style you want to /static/june_2007_style/blue_colors.ini and then: -# % cd ~/static/june_2007_style/ -# % python make_style.py blue_colors.ini blue +print """NOTE: This script is no longer used for generating stylesheets. +Invoking '%s' instead""" % cmd -def run( cmd ): - return Popen( cmd, stdout=PIPE).communicate()[0] +os.system( cmd ) -# TODO: Are these images still being used? If not, clean this code up! -images = [ - ( "./gradient.py 9 30 $panel_header_bg_top - $panel_header_bg_bottom 0 0 $panel_header_bg_bottom 1 1", "panel_header_bg.png" ), - ( "./gradient.py 9 30 $panel_header_bg_bottom - $panel_header_bg_top 0 0 $panel_header_bg_top 1 1", "panel_header_bg_pressed.png" ), - ( "./gradient.py 9 1000 $menu_bg_top $menu_bg_hatch $menu_bg_over 0 0 $menu_bg_over 1 1", "menu_bg.png" ), - ( "./gradient.py 9 1000 $base_bg_top - $base_bg_bottom 0 0 $base_bg_bottom 1 1", "base_bg.png" ), - ( "./gradient.py 9 500 $form_body_bg_top - $form_body_bg_bottom 0 0 $form_body_bg_bottom 1 1", "form_body_bg.png" ), - ( "./gradient.py 9 50 $masthead_bg $masthead_bg_hatch", "masthead_bg.png" ), - ( "./gradient.py 9 30 $footer_title_bg $footer_title_hatch 000000 0 0.5 000000 1 1", "footer_title_bg.png" ), - ( "./gradient.py 9 50 $form_title_bg_top $form_title_bg_hatch $form_title_bg_bottom 0 0 $form_title_bg_bottom 1 1", "form_title_bg.png" ), - ( "./gradient.py 9 200 $history_ok_bg - FFFFFF 0 0.5 FFFFFF 0.5 1", "ok_bg.png" ), - ( "./gradient.py 9 200 $history_error_bg - FFFFFF 0 0.5 FFFFFF 0.5 1", "error_bg.png" ), - ( "./gradient.py 9 200 $history_running_bg - FFFFFF 0 0.5 FFFFFF 0.5 1", "warn_bg.png" ), - ( "./gradient.py 9 200 $history_queued_bg - FFFFFF 0 0.5 FFFFFF 0.5 1", "gray_bg.png" ), - ( "./callout_top.py 20 10 $panel_header_bg_top $layout_border", "popupmenu_callout_top.png" ), - ( "./circle.py 12 #FFFFFF #D8B365 right > workflow_circle_open.png" ), - ( "./circle.py 12 #BBFFBB #D8B365 right > workflow_circle_green.png" ), - ( "./circle.py 12 #FFFFFF #D8B365 none> workflow_circle_drag.png" ), - ] -# TODO: Are these shared_images still being used? If not, clean this code up! -shared_images = [ - # Dialog boxes - ( "ok_large.png", "done_message_bg", "done_message_icon.png" ), - ( "info_large.png", "info_message_bg", "info_message_icon.png" ), - ( "warn_large.png", "warn_message_bg", "warn_message_icon.png" ), - ( "error_large.png", "error_message_bg", "error_message_icon.png" ), - # History icons - ( "ok_small.png", "history_ok_bg", "data_ok.png" ), - ( "error_small.png", "history_error_bg", "data_error.png" ), - ( "wait_small.png", "history_queued_bg", "data_queued.png" ), -] -if __name__ == "__main__": - print "This script is no longer used for generating stylesheets. Please use the Makefile instead" - - # Old code for processing stylesheets - """ - if len(sys.argv) > 1: # has params - ini_file, out_dir = sys.argv[1:] - else: - cwd = os.getcwd() # default settings - ini_file, out_dir = cwd + "/blue_colors.ini", cwd + "/blue" - - for in_file, out_file in templates: - print in_file ,"->", out_file - subprocess.call( "./process_css.py %s shared_images:../images %s < %s > %s" % ( ini_file, out_dir, in_file, os.path.join( out_dir, out_file ) ), shell=True ) - """ - -# Old code for processing images, long disabled, though images are still used. -""" -for rule, output in images: - t = string.Template( rule ).substitute( context ) - print t, "->", output - open( os.path.join( out_dir, output ), "w" ).write( run( t.split() ) ) - -for src, bg, out in shared_images: - t = "./png_over_color.py shared_images/%s %s %s" % ( src, context[bg], os.path.join( out_dir, out ) ) - print t - run( t.split() ) -""" - - diff -r 31937c331c4d4fc04e1d4436906411e458228d9e -r 78bf0820161fdf30cd65fc54a804b778a08f032e static/june_2007_style/png_over_color.py --- a/static/june_2007_style/png_over_color.py +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env python - -import sys -import Image -import ImageColor - -assert sys.version_info[:2] >= ( 2, 4 ) - -over = Image.open( sys.argv[1] ) -color = ImageColor.getrgb( sys.argv[2] ) - -new = Image.new( 'RGBA', over.size, color ) - -# 'Over' is passed twice since it has an alpha channel -- it is it's own mask -new.paste( over, over ) - -new.save( sys.argv[3] ) \ No newline at end of file https://bitbucket.org/galaxy/galaxy-central/changeset/484c3bfb7f3e/ changeset: 484c3bfb7f3e user: james_taylor date: 2012-03-05 20:21:46 summary: merge affected #: 73 files Diff too large to display. https://bitbucket.org/galaxy/galaxy-central/changeset/551adce80d00/ changeset: 551adce80d00 user: james_taylor date: 2012-03-09 19:37:49 summary: style: use fontawesome instead of iconic, many fixes for IE8 compatibility affected #: 18 files diff -r 484c3bfb7f3e24213447ea45ed273c328e599eb8 -r 551adce80d002272ce47a850834c26b8b63028a7 static/images/fonts/fontawesome-webfont.eot Binary file static/images/fonts/fontawesome-webfont.eot has changed diff -r 484c3bfb7f3e24213447ea45ed273c328e599eb8 -r 551adce80d002272ce47a850834c26b8b63028a7 static/images/fonts/fontawesome-webfont.svg --- /dev/null +++ b/static/images/fonts/fontawesome-webfont.svg @@ -0,0 +1,175 @@ +<?xml version="1.0" standalone="no"?> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" > +<svg xmlns="http://www.w3.org/2000/svg"> +<metadata> +This is a custom SVG webfont generated by Font Squirrel. +Designer : Dave Gandy +Foundry : Fort Awesome +</metadata> +<defs> +<font id="FontAwesomeRegular" horiz-adv-x="900" > +<font-face units-per-em="1000" ascent="750" descent="-250" /> +<missing-glyph horiz-adv-x="250" /> +<glyph unicode=" " horiz-adv-x="250" /> +<glyph horiz-adv-x="0" /> +<glyph horiz-adv-x="0" /> +<glyph unicode=" " horiz-adv-x="250" /> +<glyph unicode=" " horiz-adv-x="250" /> +<glyph unicode=" " horiz-adv-x="250" /> +<glyph unicode=" " horiz-adv-x="375" /> +<glyph unicode=" " horiz-adv-x="751" /> +<glyph unicode=" " horiz-adv-x="375" /> +<glyph unicode=" " horiz-adv-x="751" /> +<glyph unicode=" " horiz-adv-x="250" /> +<glyph unicode=" " horiz-adv-x="187" /> +<glyph unicode=" " horiz-adv-x="125" /> +<glyph unicode=" " horiz-adv-x="125" /> +<glyph unicode=" " horiz-adv-x="93" /> +<glyph unicode=" " horiz-adv-x="150" /> +<glyph unicode=" " horiz-adv-x="41" /> +<glyph unicode=" " horiz-adv-x="150" /> +<glyph unicode=" " horiz-adv-x="187" /> +<glyph unicode="" horiz-adv-x="500" d="M0 0v0v0v0v0z" /> +<glyph unicode="" horiz-adv-x="750" d="M3 727q10 23 34 23h675q25 0 35 -23t-8 -41l-298 -298v-313h121q16 0 27 -11t11 -26q0 -16 -11 -27t-27 -11h-375q-15 0 -26 11t-11 27q0 15 11 26t26 11h122v313l-298 298q-18 18 -8 41z" /> +<glyph unicode="" horiz-adv-x="688" d="M0 112q0 24 11 44.5t30 35.5t45 24t55 9q13 0 24.5 -2t22.5 -5v388l500 144v-525q0 -23 -11 -43.5t-30 -36t-45 -24.5t-55 -9t-54.5 9t-44.5 24.5t-30 36t-11 43.5t11 43.5t30 35.5t44.5 24t54.5 9q24 0 47 -6v248l-312 -90v-377q0 -23 -11 -43.5t-30 -35.5t-45 -24 t-55 -9t-55 9t-45 24t-30 35.5t-11 43.5z" /> +<glyph unicode="" horiz-adv-x="750" d="M0 437q0 65 24.5 122t67 99.5t99.5 67t122 24.5q64 0 121 -24.5t99.5 -67t67 -99.5t24.5 -122q0 -48 -13.5 -91t-38.5 -81l168 -167q9 -10 9 -23t-9 -22l-44 -44q-9 -9 -22 -9t-22 9l-168 168q-38 -25 -81 -38.5t-91 -13.5q-65 0 -122 24.5t-99.5 67t-67 99t-24.5 121.5z M125 437q0 -39 14.5 -73t40 -59.5t60 -40t73.5 -14.5t73 14.5t59.5 40t40 59.5t14.5 73t-14.5 73t-40 59.5t-59.5 40.5t-73 15t-73.5 -15t-60 -40.5t-40 -59.5t-14.5 -73zM194 437q0 25 9.5 46.5t25.5 37.5t37.5 25.5t46.5 9.5q10 0 16.5 -7t6.5 -17t-6.5 -16.5t-16.5 -6.5 q-30 0 -51 -21t-21 -51q0 -10 -6.5 -16.5t-16.5 -6.5t-17 6.5t-7 16.5z" /> +<glyph unicode="" d="M0 56v587v32v19q0 23 16.5 39.5t39.5 16.5h19h750h19q23 0 39.5 -16.5t16.5 -39.5v-19v-30v-589q0 -23 -16.5 -39.5t-39.5 -16.5h-788q-23 0 -39.5 16.5t-16.5 39.5zM75 75h750v416q-15 -15 -28 -24q-29 -21 -61 -46t-64 -49q-19 -14 -36.5 -28t-32.5 -25q-3 -2 -6 -4.5 t-7 -5.5q-14 -11 -29.5 -22.5t-33.5 -22t-37.5 -17t-40.5 -6.5q-20 0 -39.5 6.5t-37 17t-33.5 22t-29 22.5q-4 3 -7 5.5t-6 4.5q-15 11 -32.5 25t-36.5 28q-32 24 -64 49t-61 46q-13 9 -28 24v-416zM75 643q0 -14 6 -30t16.5 -32t23 -30t26.5 -24q23 -17 49 -37l52 -38 q26 -20 50 -39t44 -34l22 -17q14 -11 28.5 -21t29 -17.5t27.5 -7.5h1h1q13 0 27.5 7.5t29 17.5t28.5 21l22 17q20 15 44 34t50 39l52 38q26 20 49 37q13 10 26 24t23.5 30t16.5 32t6 30v32h-750v-32z" /> +<glyph unicode="" horiz-adv-x="846" d="M0 519q0 64 20 108t52.5 71.5t73.5 39.5t83 12q30 0 59 -10t54 -25t45.5 -32.5t35.5 -32.5q15 15 35.5 32.5t45.5 32.5t54 25t59 10q42 0 83 -12t73.5 -39.5t52.5 -71.5t20 -108q0 -44 -16.5 -83.5t-36 -69.5t-37 -48t-18.5 -19l-289 -288q-11 -11 -26 -11t-26 11 l-290 288q-1 1 -18 19t-36.5 48t-36 69.5t-16.5 83.5z" /> +<glyph unicode="" horiz-adv-x="787" d="M0.5 465q4.5 13 25.5 16l238 35l106 215q10 20 23.5 20t22.5 -20l107 -215l237 -35q22 -3 26 -16t-11 -28l-172 -168l40 -236q4 -22 -7 -30t-30 3l-213 111l-212 -111q-20 -11 -31 -3t-7 30l41 236l-172 168q-16 15 -11.5 28z" /> +<glyph unicode="" horiz-adv-x="787" d="M0.5 465q4.5 13 25.5 16l238 34l106 216q9 19 23 19t23 -19l107 -216l237 -34q22 -3 26 -16t-11 -28l-172 -168l40 -236q3 -16 -2 -24.5t-16 -8.5q-7 0 -19 5l-213 112l-212 -112q-12 -5 -19 -5q-11 0 -16 8.5t-3 24.5l41 236l-172 168q-16 15 -11.5 28zM136 421l100 -98 l29 -27l-7 -39l-24 -139l124 66l35 18l35 -18l124 -66l-23 139l-7 39l28 27l101 98l-139 20l-39 6l-18 35l-62 126l-62 -126l-17 -35l-39 -6z" /> +<glyph unicode="" d="M0 34v7q11 19 19.5 40t17.5 42t19.5 40t25.5 34q7 7 15.5 13.5t19.5 10.5t23.5 5t25.5 3q37 6 77.5 12.5t78.5 12.5q4 17 7 34.5t8 33.5q-8 11 -16 21.5t-15.5 23t-13.5 28.5t-9 37q-2 11 -5 32.5t-6 44t-5.5 41t-2.5 22.5q0 25 10.5 56t33 58t58 45.5t84.5 18.5 t84.5 -18.5t58 -45.5t33 -58t10.5 -56q0 -4 -2.5 -22.5t-5.5 -41t-6 -44t-5 -32.5q-3 -21 -9 -37t-13.5 -28.5t-16 -23t-15.5 -21.5q5 -16 8 -33.5t7 -34.5q38 -6 78.5 -12.5t77.5 -12.5q13 -2 25.5 -3t23.5 -5t19.5 -10.5t15.5 -13.5q15 -15 25.5 -34t19.5 -40t17.5 -42 t19.5 -40v-7q-14 -8 -26.5 -18.5t-30.5 -15.5h-786q-18 5 -30.5 15.5t-26.5 18.5z" /> +<glyph unicode="" d="M0 56v638q0 23 16.5 39.5t39.5 16.5h788q23 0 39.5 -16.5t16.5 -39.5v-638q0 -23 -16.5 -39.5t-39.5 -16.5h-788q-23 0 -39.5 16.5t-16.5 39.5zM56 75q0 -8 5.5 -13.5t13.5 -5.5h75q8 0 13.5 5.5t5.5 13.5v75q0 8 -5.5 13.5t-13.5 5.5h-75q-8 0 -13.5 -5.5t-5.5 -13.5 v-75zM56 250q0 -8 5.5 -13.5t13.5 -5.5h75q8 0 13.5 5.5t5.5 13.5v75q0 8 -5.5 13.5t-13.5 5.5h-75q-8 0 -13.5 -5.5t-5.5 -13.5v-75zM56 425q0 -8 5.5 -13.5t13.5 -5.5h75q8 0 13.5 5.5t5.5 13.5v75q0 8 -5.5 13.5t-13.5 5.5h-75q-8 0 -13.5 -5.5t-5.5 -13.5v-75zM56 600 q0 -8 5.5 -13.5t13.5 -5.5h75q8 0 13.5 5.5t5.5 13.5v75q0 8 -5.5 13.5t-13.5 5.5h-75q-8 0 -13.5 -5.5t-5.5 -13.5v-75zM225 75q0 -8 5.5 -13.5t13.5 -5.5h412q8 0 13.5 5.5t5.5 13.5v250q0 8 -5.5 13.5t-13.5 5.5h-412q-8 0 -13.5 -5.5t-5.5 -13.5v-250zM225 425 q0 -8 5.5 -13.5t13.5 -5.5h412q8 0 13.5 5.5t5.5 13.5v250q0 8 -5.5 13.5t-13.5 5.5h-412q-8 0 -13.5 -5.5t-5.5 -13.5v-250zM731 75q0 -8 5.5 -13.5t13.5 -5.5h75q8 0 13.5 5.5t5.5 13.5v75q0 8 -5.5 13.5t-13.5 5.5h-75q-8 0 -13.5 -5.5t-5.5 -13.5v-75zM731 250 q0 -8 5.5 -13.5t13.5 -5.5h75q8 0 13.5 5.5t5.5 13.5v75q0 8 -5.5 13.5t-13.5 5.5h-75q-8 0 -13.5 -5.5t-5.5 -13.5v-75zM731 425q0 -8 5.5 -13.5t13.5 -5.5h75q8 0 13.5 5.5t5.5 13.5v75q0 8 -5.5 13.5t-13.5 5.5h-75q-8 0 -13.5 -5.5t-5.5 -13.5v-75zM731 600 q0 -8 5.5 -13.5t13.5 -5.5h75q8 0 13.5 5.5t5.5 13.5v75q0 8 -5.5 13.5t-13.5 5.5h-75q-8 0 -13.5 -5.5t-5.5 -13.5v-75z" /> +<glyph unicode="" d="M0 38v262q0 16 11 27t27 11h337q16 0 27 -11t11 -27v-262q0 -16 -11 -27t-27 -11h-337q-16 0 -27 11t-11 27zM0 450v263q0 15 11 26t27 11h337q16 0 27 -11t11 -26v-263q0 -16 -11 -26.5t-27 -10.5h-337q-16 0 -27 10.5t-11 26.5zM488 38v262q0 16 10.5 27t26.5 11h338 q15 0 26 -11t11 -27v-262q0 -16 -11 -27t-26 -11h-338q-16 0 -26.5 11t-10.5 27zM488 450v263q0 15 10.5 26t26.5 11h338q15 0 26 -11t11 -26v-263q0 -16 -11 -26.5t-26 -10.5h-338q-16 0 -26.5 10.5t-10.5 26.5z" /> +<glyph unicode="" d="M0 38v132q0 16 11 26.5t27 10.5h175q15 0 26 -10.5t11 -26.5v-132q0 -16 -11 -27t-26 -11h-175q-16 0 -27 11t-11 27zM0 320v110q0 16 11 26.5t27 10.5h175q15 0 26 -10.5t11 -26.5v-110q0 -16 -11 -27t-26 -11h-175q-16 0 -27 11t-11 27zM0 580v133q0 15 11 26t27 11 h175q15 0 26 -11t11 -26v-133q0 -16 -11 -27t-26 -11h-175q-16 0 -27 11t-11 27zM325 38v132q0 16 11 26.5t27 10.5h175q15 0 26 -10.5t11 -26.5v-132q0 -16 -11 -27t-26 -11h-175q-16 0 -27 11t-11 27zM325 320v110q0 16 11 26.5t27 10.5h175q15 0 26 -10.5t11 -26.5v-110 q0 -16 -11 -27t-26 -11h-175q-16 0 -27 11t-11 27zM325 580v133q0 15 11 26t27 11h175q15 0 26 -11t11 -26v-133q0 -16 -11 -27t-26 -11h-175q-16 0 -27 11t-11 27zM650 38v132q0 16 11 26.5t27 10.5h175q15 0 26 -10.5t11 -26.5v-132q0 -16 -11 -27t-26 -11h-175 q-16 0 -27 11t-11 27zM650 320v110q0 16 11 26.5t27 10.5h175q15 0 26 -10.5t11 -26.5v-110q0 -16 -11 -27t-26 -11h-175q-16 0 -27 11t-11 27zM650 580v133q0 15 11 26t27 11h175q15 0 26 -11t11 -26v-133q0 -16 -11 -27t-26 -11h-175q-16 0 -27 11t-11 27z" /> +<glyph unicode="" d="M0 38v132q0 16 11 26.5t27 10.5h145q15 0 26 -10.5t11 -26.5v-132q0 -16 -11 -27t-26 -11h-145q-16 0 -27 11t-11 27zM0 320v110q0 16 11 26.5t27 10.5h145q15 0 26 -10.5t11 -26.5v-110q0 -16 -11 -27t-26 -11h-145q-16 0 -27 11t-11 27zM0 580v133q0 15 11 26t27 11 h145q15 0 26 -11t11 -26v-133q0 -16 -11 -27t-26 -11h-145q-16 0 -27 11t-11 27zM295 38v132q0 16 11 26.5t27 10.5h530q15 0 26 -10.5t11 -26.5v-132q0 -16 -11 -27t-26 -11h-530q-16 0 -27 11t-11 27zM295 320v110q0 16 11 26.5t27 10.5h530q15 0 26 -10.5t11 -26.5v-110 q0 -16 -11 -27t-26 -11h-530q-16 0 -27 11t-11 27zM295 580v133q0 15 11 26t27 11h530q15 0 26 -11t11 -26v-133q0 -16 -11 -27t-26 -11h-530q-16 0 -27 11t-11 27z" /> +<glyph unicode="" d="M0 312.5q0 16.5 11 27.5l85 85q11 11 27.5 11t27.5 -11l178 -178q11 -11 27.5 -11t27.5 11l364 364q11 11 27.5 11t27.5 -11l85 -85q11 -11 11 -27.5t-11 -27.5l-444 -444q-11 -11 -30.5 -19t-35.5 -8h-43q-17 0 -36.5 8t-30.5 19l-257 258q-11 11 -11 27.5z" /> +<glyph unicode="" horiz-adv-x="750" d="M0 94q0 19 14 33l248 249l-248 244q-14 14 -14 33t14 33l49 49q14 14 33 14t33 -14l246 -246l246 246q14 14 33 14t33 -14l49 -49q14 -14 14 -33t-14 -33l-248 -249l248 -244q14 -14 14 -32.5t-14 -32.5l-49 -50q-14 -14 -33 -14t-33 14l-246 247l-247 -247 q-14 -14 -32.5 -14t-32.5 14l-49 49q-14 14 -14 33z" /> +<glyph unicode="" horiz-adv-x="750" d="M0 437q0 65 24.5 122t67 99.5t99.5 67t122 24.5q64 0 121 -24.5t99.5 -67t67 -99.5t24.5 -122q0 -48 -13.5 -91t-38.5 -81l168 -167q9 -10 9 -23t-9 -22l-44 -44q-9 -9 -22 -9t-22 9l-168 168q-38 -25 -81 -38.5t-91 -13.5q-65 0 -122 24.5t-99.5 67t-67 99t-24.5 121.5z M125 437q0 -39 14.5 -73t40 -59.5t60 -40t73.5 -14.5t73 14.5t59.5 40t40 59.5t14.5 73t-14.5 73t-40 59.5t-59.5 40.5t-73 15t-73.5 -15t-60 -40.5t-40 -59.5t-14.5 -73zM188 422v31q0 7 4.5 11.5t10.5 4.5h78v78q0 6 4.5 10.5t11.5 4.5h31q7 0 11.5 -4.5t4.5 -10.5v-78h78 q16 0 16 -16v-31q0 -16 -16 -16h-78v-78q0 -16 -16 -16h-31q-16 0 -16 16v78h-78q-6 0 -10.5 4.5t-4.5 11.5z" /> +<glyph unicode="" horiz-adv-x="750" d="M0 437q0 65 24.5 122t67 99.5t99.5 67t122 24.5q64 0 121 -24.5t99.5 -67t67 -99.5t24.5 -122q0 -48 -13.5 -91t-38.5 -81l168 -167q9 -10 9 -23t-9 -22l-44 -44q-9 -9 -22 -9t-22 9l-168 168q-38 -25 -81 -38.5t-91 -13.5q-65 0 -122 24.5t-99.5 67t-67 99t-24.5 121.5z M125 437q0 -39 14.5 -73t40 -59.5t60 -40t73.5 -14.5t73 14.5t59.5 40t40 59.5t14.5 73t-14.5 73t-40 59.5t-59.5 40.5t-73 15t-73.5 -15t-60 -40.5t-40 -59.5t-14.5 -73zM188 422v31q0 7 4.5 11.5t10.5 4.5h219q16 0 16 -16v-31q0 -16 -16 -16h-219q-6 0 -10.5 4.5 t-4.5 11.5z" /> +<glyph unicode="" horiz-adv-x="713" d="M0 356q0 89 41 166.5t115 128.5q6 3 14 3q7 -1 12 -8l42 -62q10 -16 -5 -26q-51 -35 -78.5 -88t-27.5 -114q0 -50 19 -94.5t52 -77.5t77.5 -52t94.5 -19q51 0 95.5 19t77.5 52t52 77.5t19 94.5q0 61 -28 114t-79 88q-6 3 -8 12q-1 6 3 14l43 62q5 6 12 7.5t14 -2.5 q73 -51 114.5 -128.5t41.5 -166.5q0 -74 -28 -138.5t-76.5 -113t-113.5 -76.5t-139 -28t-138.5 28t-113 76.5t-76.5 113t-28 138.5zM300 394v337q0 19 19 19h75q8 0 13.5 -5.5t5.5 -13.5v-337q0 -8 -5.5 -13.5t-13.5 -5.5h-75q-19 0 -19 19z" /> +<glyph unicode="" d="M0 19v127q0 8 5.5 13.5t13.5 5.5h94q8 0 13 -5.5t5 -13.5v-127q0 -8 -5 -13.5t-13 -5.5h-94q-19 0 -19 19zM192 19v212q0 8 5.5 13.5t13.5 5.5h94q8 0 13 -5.5t5 -13.5v-212q0 -8 -5 -13.5t-13 -5.5h-94q-8 0 -13.5 5.5t-5.5 13.5zM384 19v330q0 8 5.5 13.5t13.5 5.5h94 q8 0 13.5 -5.5t5.5 -13.5v-330q0 -8 -5.5 -13.5t-13.5 -5.5h-94q-8 0 -13.5 5.5t-5.5 13.5zM577 19v486q0 8 5 13.5t13 5.5h94q8 0 13.5 -5.5t5.5 -13.5v-486q0 -8 -5.5 -13.5t-13.5 -5.5h-94q-8 0 -13 5.5t-5 13.5zM769 19v712q0 19 19 19h93q19 0 19 -19v-712 q0 -19 -19 -19h-93q-19 0 -19 19z" /> +<glyph unicode="" horiz-adv-x="748" d="M0 320v111q0 7 7 9q19 5 39.5 8t40.5 5q4 0 8 0.5t9 1.5q5 14 10.5 27.5t12.5 27.5q-12 17 -26.5 36.5t-30.5 37.5q-5 5 0 12q19 23 40 44t44 40q5 5 12 0q11 -11 22.5 -20t23.5 -17q7 -5 14 -10.5t14 -10.5q26 14 55 23q3 28 6 51.5t8 45.5q2 8 9 8h111q9 0 9 -8 q4 -19 6.5 -38t5.5 -39l3 -20q14 -5 27.5 -10t26.5 -13q7 5 13 9.5t12 9.5q13 10 26 19t25 20q6 6 12 -1l11 -11q5 -5 11 -10q15 -14 30 -29.5t29 -32.5q4 -6 0 -12q-13 -15 -26 -32.5t-30 -40.5q15 -29 24 -58q12 -3 24.5 -4.5t25.5 -3.5q11 -2 23.5 -3.5t23.5 -3.5 q7 -2 7 -9v-111q0 -7 -7 -9q-18 -5 -38 -7.5t-40 -4.5q-5 -1 -9.5 -1.5t-9.5 -1.5q-5 -14 -10.5 -27.5t-12.5 -27.5q12 -17 26.5 -36.5t30.5 -37.5q5 -5 0 -12q-38 -47 -84 -84q-5 -5 -12 0q-11 11 -22.5 20t-23.5 17q-7 5 -14 10.5t-14 10.5q-26 -14 -55 -23 q-2 -23 -5.5 -48t-9.5 -49q-2 -8 -9 -8h-111q-7 0 -9 8q-3 19 -5.5 38t-5.5 39l-3 20q-14 5 -27.5 10t-26.5 13q-6 -5 -12.5 -9.5t-12.5 -9.5q-26 -18 -51 -39q-6 -6 -12 1q-5 5 -11 10.5t-11 10.5q-15 14 -30 29.5t-29 32.5q-5 6 0 12q15 18 29 37t27 36q-15 29 -24 58 q-12 3 -24.5 4.5t-24.5 3.5t-24.5 3.5t-23.5 3.5q-7 2 -7 9zM261 375q0 -24 9 -44.5t24.5 -35.5t36 -24t43.5 -9t43.5 9t35.5 24t24 35.5t9 44.5q0 23 -9 43.5t-24 35.5t-35.5 24t-43.5 9t-43.5 -9t-36 -24t-24.5 -35.5t-9 -43.5z" /> +<glyph unicode="" horiz-adv-x="648" d="M0 582q0 8 0.5 16t0.5 17q11 6 32.5 10t47 7t52.5 5t49 3q-2 16 -1 32t7 33q1 4 6 11.5t18.5 15t40 13t71.5 5.5t71.5 -5.5t40 -13t18 -15.5t6.5 -12q6 -17 7 -32.5t-1 -31.5q22 -1 49 -3t53 -5t47 -7t32 -10q1 -9 1 -17v-16v-16q0 -8 -1 -17q-10 -6 -30.5 -10t-45.5 -7 t-51 -5t-48 -3t-37 -1.5t-16 -0.5l-95 -1h-13h-28q-19 0 -54 1q-2 0 -16.5 0.5t-36.5 1.5t-48 3t-51 5t-45.5 7t-30.5 10q0 9 -0.5 17t-0.5 16zM67 484q41 -5 84.5 -7.5t75.5 -3.5q9 -1 23 -1h74h73q14 0 23 1q33 1 76.5 3.5t84.5 7.5q-5 -76 -8 -154.5t-7 -154.5 q-1 -19 -1.5 -42.5t-2 -45.5t-6 -40.5t-14.5 -28.5q-12 -11 -42 -14.5t-58 -3.5h-236q-29 0 -58.5 3.5t-41.5 14.5q-10 10 -14.5 28.5t-6 40.5t-2 45.5t-1.5 42.5q-4 76 -7.5 154.5t-7.5 154.5zM147 383q1 -15 1 -28t1 -22q0 -11 1 -19q2 -34 3.5 -68t3.5 -67q1 -8 1 -17 v-20v-12q0 -6 0.5 -14t1.5 -19q1 -8 9.5 -14t13.5 -6q5 -1 10 -1t8 -1h11q5 0 5 19v286q0 8 -5.5 13.5t-13.5 5.5l-33 2q-8 0 -13 -5t-5 -13zM255.5 657q0.5 -6 1.5 -15q9 1 20 1h47l67 -1q1 9 1.5 15t-0.5 11q-11 3 -29.5 4.5t-38.5 1.5t-38.5 -1.5t-29.5 -4.5 q-1 -5 -0.5 -11zM292 94q0 -8 5 -13.5t13 -5.5h28q8 0 13.5 5.5t5.5 13.5v285q0 8 -11 13t-14 5h-15q-3 0 -14 -5t-11 -13v-285zM432 94q0 -19 4 -19h11q3 1 13 1.5t15 0.5q5 1 8.5 6.5t4.5 13.5q0 11 0.5 19t0.5 14q0 7 1 12v20q0 9 1 17q2 33 3 66.5t3 67.5q0 9 1 20 q1 9 1.5 22t1.5 28q0 8 -5 13t-13 5l-33 -2q-8 0 -13 -5.5t-5 -13.5v-286z" /> +<glyph unicode="" d="M1 384.5q3 11.5 13 19.5l412 338q11 8 24 8t24 -8l126 -104v58q0 19 19 19h112q19 0 19 -19v-180l136 -112q10 -8 13 -19.5t-1 -22.5q-10 -24 -36 -24h-75v-300q0 -16 -10.5 -27t-26.5 -11h-206v225h-188v-225h-206q-16 0 -27 11t-11 27v300h-75q-25 0 -35 24 q-4 11 -1 22.5z" /> +<glyph unicode="" horiz-adv-x="600" d="M0 56v638q0 23 16.5 39.5t39.5 16.5h219v-269q0 -23 16.5 -39.5t39.5 -16.5h269v-369q0 -23 -16.5 -39.5t-39.5 -16.5h-488q-23 0 -39.5 16.5t-16.5 39.5zM331 481v266h3l263 -263v-3h-266z" /> +<glyph unicode="" horiz-adv-x="750" d="M0 375q0 78 29.5 146t80.5 119t119 80.5t146 29.5t146 -29.5t119 -80.5t80.5 -119t29.5 -146t-29.5 -146t-80.5 -119t-119 -80.5t-146 -29.5t-146 29.5t-119 80.5t-80.5 119t-29.5 146zM113 375q0 -54 20.5 -102t56 -83.5t83.5 -56t102 -20.5t102 20.5t84 56t56.5 83.5 t20.5 102t-20.5 102t-56.5 84t-84 56.5t-102 20.5t-102 -20.5t-83.5 -56.5t-56 -84t-20.5 -102zM319 375v150q0 23 16.5 39.5t39.5 16.5t39.5 -16.5t16.5 -39.5v-127l90 -89q17 -17 17 -40t-17 -40q-8 -8 -18.5 -12t-21.5 -4t-21.5 4t-18.5 12l-106 106q-1 1 -1 2t-1 2 q-7 7 -10 14q-4 9 -4 22z" /> +<glyph unicode="" d="M1 17l290 716q3 7 10.5 12t15.5 5h95l-4 -83h84l-4 83h95q8 0 15.5 -5t10.5 -12l290 -716q3 -7 -0.5 -12t-11.5 -5h-361l-13 250h-126l-13 -250h-361q-8 0 -11.5 5t-0.5 12zM394 389h112l-10 202h-92z" /> +<glyph unicode="" d="M0 19v300q0 8 5.5 13.5t13.5 5.5h112q8 0 13.5 -5.5t5.5 -13.5v-169h600v169q0 8 5.5 13.5t13.5 5.5h112q8 0 13.5 -5.5t5.5 -13.5v-300q0 -19 -19 -19h-862q-19 0 -19 19zM169 461q3 8 19 8h150v244q0 15 10.5 26t26.5 11h150q16 0 27 -11t11 -26v-244h150q15 0 18 -8 t-8 -19l-246 -247q-11 -11 -27 -11t-27 11l-246 247q-11 11 -8 19z" /> +<glyph unicode="" horiz-adv-x="750" d="M0 375q0 78 29.5 146t80.5 119t119 80.5t146 29.5t146 -29.5t119 -80.5t80.5 -119t29.5 -146t-29.5 -146t-80.5 -119t-119 -80.5t-146 -29.5t-146 29.5t-119 80.5t-80.5 119t-29.5 146zM113 375q0 -54 20.5 -102t56 -83.5t83.5 -56t102 -20.5t102 20.5t84 56t56.5 83.5 t20.5 102t-20.5 102t-56.5 83.5t-84 56t-102 20.5t-102 -20.5t-83.5 -56t-56 -83.5t-20.5 -102zM206 349q4 10 24 10h79v185q0 8 5.5 13.5t13.5 5.5h94q8 0 13.5 -5.5t5.5 -13.5v-185h79q20 0 24 -10t-10 -24l-136 -136q-9 -9 -23 -9q-13 0 -23 9l-136 136q-14 14 -10 24z " /> +<glyph unicode="" horiz-adv-x="750" d="M0 375q0 78 29.5 146t80.5 119t119 80.5t146 29.5t146 -29.5t119 -80.5t80.5 -119t29.5 -146t-29.5 -146t-80.5 -119t-119 -80.5t-146 -29.5t-146 29.5t-119 80.5t-80.5 119t-29.5 146zM113 375q0 -54 20.5 -102t56 -83.5t83.5 -56t102 -20.5t102 20.5t84 56t56.5 83.5 t20.5 102t-20.5 102t-56.5 83.5t-84 56t-102 20.5t-102 -20.5t-83.5 -56t-56 -83.5t-20.5 -102zM206 401q-4 10 10 24l136 136q10 9 23 9q12 0 23 -9l136 -136q14 -14 10 -24t-24 -10h-79v-185q0 -8 -5.5 -13.5t-13.5 -5.5h-94q-8 0 -13.5 5.5t-5.5 13.5v185h-79 q-20 0 -24 10z" /> +<glyph unicode="" d="M0 38v282q0 16 4.5 37t10.5 35l139 324q6 14 21.5 24t30.5 10h488q15 0 30.5 -10t21.5 -24l139 -324q6 -14 10.5 -35t4.5 -37v-282q0 -16 -11 -27t-26 -11h-825q-16 0 -27 11t-11 27zM116 339h189l56 -113h187l57 113h179q-1 2 -1 4.5t-1 4.5l-125 290h-414l-125 -291 q-1 -1 -1 -3.5t-1 -4.5z" /> +<glyph unicode="" horiz-adv-x="750" d="M0 375q0 78 29.5 146t80.5 119t119 80.5t146 29.5t146 -29.5t119 -80.5t80.5 -119t29.5 -146t-29.5 -146t-80.5 -119t-119 -80.5t-146 -29.5t-146 29.5t-119 80.5t-80.5 119t-29.5 146zM113 375q0 -54 20.5 -102t56 -83.5t83.5 -56t102 -20.5t102 20.5t84 56t56.5 83.5 t20.5 102t-20.5 102t-56.5 84t-84 56.5t-102 20.5t-102 -20.5t-83.5 -56.5t-56 -84t-20.5 -102zM258 220v310q0 9 8 14q8 4 15 0l269 -156q8 -3 8 -13t-8 -13l-269 -156q-4 -2 -8 -2q-3 0 -7 2q-8 5 -8 14z" /> +<glyph unicode="" horiz-adv-x="747" d="M0 375q0 78 29.5 146t80.5 119t119 80.5t146 29.5q66 0 127.5 -23t112.5 -65l76 76q16 16 27 11.5t11 -27.5v-217q0 -15 -11 -26q-10 -10 -25 -10l-217 -1q-23 0 -27.5 11.5t11.5 27.5l75 75q-35 26 -75.5 41t-84.5 15q-54 0 -102 -20.5t-83.5 -56.5t-56 -84t-20.5 -102 t20.5 -102t56 -83.5t83.5 -56t102 -20.5q49 0 93.5 17t79.5 47.5t58 72t29 90.5q1 6 7 12q7 5 14 4l75 -10q8 -1 12.5 -7t3.5 -14q-9 -69 -42 -128.5t-83 -103t-113.5 -68.5t-133.5 -25q-78 0 -146 29.5t-119 80.5t-80.5 119t-29.5 146z" /> +<glyph unicode="" d="M3 160l70 206q4 13 18 20q15 6 28 2l206 -70q21 -7 21.5 -19t-19.5 -22l-95 -47q24 -36 57.5 -63t75.5 -41q51 -18 103 -13.5t97.5 26.5t80.5 61t53 90q2 8 8.5 11t14.5 1l71 -24q17 -7 12 -24q-25 -74 -75 -129t-114.5 -86.5t-139 -37.5t-147.5 19q-63 21 -113.5 62 t-84.5 98l-97 -47q-20 -11 -29.5 -2.5t-1.5 29.5zM95 495q25 73 75 128.5t114.5 87.5t138.5 38t148 -19q63 -22 113 -63t85 -98l97 48q20 10 29.5 1.5t1.5 -29.5l-70 -205q-4 -14 -18 -21q-15 -6 -28 -2l-206 70q-21 7 -21.5 19t19.5 22l95 47q-24 36 -58 63t-76 41 q-51 18 -103 13.5t-97 -26.5t-80 -61t-53 -90q-2 -8 -9 -11t-14 -1l-71 25q-8 2 -11 9t-1 14z" /> +<glyph unicode="" d="M0 56v638q0 23 16.5 39.5t39.5 16.5h788q23 0 39.5 -16.5t16.5 -39.5v-638q0 -23 -16.5 -39.5t-39.5 -16.5h-788q-23 0 -39.5 16.5t-16.5 39.5zM75 75h750v525h-750v-525zM150 169v37q0 19 19 19h75q8 0 13.5 -5.5t5.5 -13.5v-37q0 -8 -5.5 -13.5t-13.5 -5.5h-75 q-19 0 -19 19zM150 319v37q0 19 19 19h75q8 0 13.5 -5.5t5.5 -13.5v-37q0 -8 -5.5 -13.5t-13.5 -5.5h-75q-19 0 -19 19zM150 469v37q0 19 19 19h75q8 0 13.5 -5.5t5.5 -13.5v-37q0 -8 -5.5 -13.5t-13.5 -5.5h-75q-19 0 -19 19zM338 169v37q0 8 5 13.5t13 5.5h375 q19 0 19 -19v-37q0 -19 -19 -19h-375q-8 0 -13 5.5t-5 13.5zM338 319v37q0 8 5 13.5t13 5.5h375q19 0 19 -19v-37q0 -19 -19 -19h-375q-8 0 -13 5.5t-5 13.5zM338 469v37q0 8 5 13.5t13 5.5h375q19 0 19 -19v-37q0 -19 -19 -19h-375q-8 0 -13 5.5t-5 13.5z" /> +<glyph unicode="" horiz-adv-x="750" d="M0 56v300q0 23 16.5 40t39.5 17h57v85q0 52 20.5 98t56 80t83.5 54t102 20t102 -20t84 -54t56.5 -80t20.5 -98v-85h56q23 0 39.5 -17t16.5 -40v-300q0 -23 -16.5 -39.5t-39.5 -16.5h-638q-23 0 -39.5 16.5t-16.5 39.5zM225 413h300v85q0 29 -12 54.5t-32 44.5t-47.5 30 t-58.5 11t-58.5 -11t-47.5 -30t-32 -44.5t-12 -54.5v-85z" /> +<glyph unicode="" d="M0 675q0 31 22 53t53 22t53 -22t22 -53q0 -20 -10 -36.5t-27 -27.5v-592q0 -8 -5.5 -13.5t-13.5 -5.5h-38q-8 0 -13 5.5t-5 13.5v592q-17 11 -27.5 27.5t-10.5 36.5zM150 203v364q0 16 9.5 32t23.5 24q51 27 92 42t70 22q34 8 61 9q33 0 60.5 -5.5t52.5 -14.5t48.5 -21 t48.5 -25q31 -14 71 -16q34 -2 80 7.5t101 42.5q14 8 23 3t9 -21v-365q0 -15 -9 -31.5t-23 -24.5q-55 -33 -101 -42.5t-80 -7.5q-40 2 -71 16q-25 13 -48.5 25t-48.5 21t-52.5 14.5t-60.5 5.5q-27 -1 -61 -9q-29 -7 -70 -22t-92 -43q-14 -8 -23.5 -2t-9.5 22z" /> +<glyph unicode="" d="M0 356q0 54 18.5 104.5t50 94t75 79.5t93.5 62t104.5 40t108.5 14t108.5 -14t104.5 -40t93.5 -62t75 -79.5t50 -94t18.5 -104.5q0 -87 -36 -165l-13 -28l-81 -12q-13 -49 -52.5 -81t-92.5 -32v-19q0 -8 -5.5 -13.5t-13.5 -5.5h-38q-8 0 -13 5.5t-5 13.5v337q0 8 5 13.5 t13 5.5h38q8 0 13.5 -5.5t5.5 -13.5v-18q42 0 75.5 -21t53.5 -54l19 2q15 43 15 91q0 58 -31 109.5t-80 89.5t-109 60.5t-118 22.5t-118 -22.5t-108.5 -60.5t-79.5 -89.5t-31 -109.5q0 -46 14 -91l19 -2q20 33 53.5 54t75.5 21v18q0 8 5.5 13.5t13.5 5.5h38q8 0 13 -5.5 t5 -13.5v-337q0 -8 -5 -13.5t-13 -5.5h-38q-8 0 -13.5 5.5t-5.5 13.5v19q-53 0 -92.5 32t-52.5 81l-81 12l-13 28q-36 78 -36 165z" /> +<glyph unicode="" horiz-adv-x="425" d="M0 286v178q0 8 5.5 13.5t13.5 5.5h196l153 153q23 23 39.5 16t16.5 -39v-476q0 -32 -16.5 -39t-39.5 16l-153 153h-196q-8 0 -13.5 5.5t-5.5 13.5z" /> +<glyph unicode="" horiz-adv-x="600" d="M0 286v178q0 8 5.5 13.5t13.5 5.5h196l153 153q23 23 39.5 16t16.5 -39v-476q0 -32 -16.5 -39t-39.5 16l-153 153h-196q-8 0 -13.5 5.5t-5.5 13.5zM482 205q-4 15 4 29q39 67 39 141q0 73 -39 141q-8 14 -4 29t18 23t28.5 4t22.5 -18q49 -87 49 -179t-49 -179 q-11 -19 -33 -19q-8 0 -18 5q-14 8 -18 23z" /> +<glyph unicode="" d="M0 286v178q0 8 5.5 13.5t13.5 5.5h196l153 153q23 23 39.5 16t16.5 -39v-476q0 -32 -16.5 -39t-39.5 16l-153 153h-196q-8 0 -13.5 5.5t-5.5 13.5zM482 205q-4 15 4 29q39 67 39 141q0 73 -39 141q-8 14 -4 29t18 23t28.5 4t22.5 -18q49 -87 49 -179t-49 -179 q-11 -19 -33 -19q-8 0 -18 5q-14 8 -18 23zM603 117q-3 15 5 29q67 105 67 229t-67 229q-8 14 -5 29t17 23t29 5t23 -17q38 -61 58 -129t20 -140t-20 -140t-58 -129q-5 -9 -14 -13.5t-18 -4.5q-11 0 -20 6q-14 8 -17 23zM723.5 30q-2.5 15 5.5 28q48 72 72 152t24 165 t-24 165t-72 152q-8 13 -5.5 28t16.5 24q13 8 28 5t24 -16q54 -81 81 -171.5t27 -186.5t-27 -186.5t-81 -171.5q-12 -17 -32 -17q-11 0 -20 6q-14 9 -16.5 24z" /> +<glyph unicode="" horiz-adv-x="750" d="M0 0v341h341v-341h-341zM0 409v341h341v-341h-341zM68 68h205v205h-205v-205zM68 477h205v205h-205v-205zM136 136v69h69v-69h-69zM136 545v68h69v-68h-69zM409 0v341h204v-68h69v68h68v-205h-205v68h-68v-204h-68zM409 409v341h341v-341h-341zM477 477h205v205h-205 v-205zM545 0v68h68v-68h-68zM545 545v68h68v-68h-68zM682 0v68h68v-68h-68z" /> +<glyph unicode="" d="M0 0v750h75v-750h-75zM111 0v750h18v-750h-18zM174 0v750h57v-750h-57zM266 0v750h38v-750h-38zM349 0v750h37v-750h-37zM441 0v750h18v-750h-18zM495 0v750h75v-750h-75zM596 0v750h38v-750h-38zM688 0v750h19v-750h-19zM771 0v750h18v-750h-18zM825 0v750h75v-750h-75z " /> +<glyph unicode="" horiz-adv-x="750" d="M0 474v218q0 24 17 41t41 17h218q24 0 53 -12t46 -29l358 -358q17 -17 17 -41t-17 -41l-252 -252q-17 -17 -41 -17t-41 17l-358 358q-17 17 -29 46t-12 53zM94 600q0 -23 16.5 -39.5t39.5 -16.5t39.5 16.5t16.5 39.5t-16.5 39.5t-39.5 16.5t-39.5 -16.5t-16.5 -39.5z" /> +<glyph unicode="" horiz-adv-x="898" d="M0 475v217q0 24 17 41t41 17h217q24 0 53.5 -11.5t45.5 -29.5l321 -358q16 -17 16.5 -41t-16.5 -41l-252 -251q-17 -17 -41 -17.5t-41 17.5l-320 358q-16 18 -28.5 46.5t-12.5 52.5zM94 600q0 -23 16.5 -39.5t39.5 -16.5t39.5 16.5t16.5 39.5t-16.5 39.5t-39.5 16.5 t-39.5 -16.5t-16.5 -39.5zM379 749h83q24 0 53.5 -12t45.5 -29l321 -358q16 -18 16.5 -41.5t-16.5 -40.5l-252 -251q-17 -17 -41 -17.5t-41 17.5l-6 7l246 245q17 17 16.5 41t-16.5 41l-320 358q-15 16 -40.5 27t-48.5 13z" /> +<glyph unicode="" horiz-adv-x="835" d="M5 152q1 8 2 15.5t2 16.5q0 5 -2 10t-1 10q1 8 7.5 15.5t12.5 17.5q11 18 22 44t16 45q2 8 -0.5 15t-0.5 13q2 8 8 13.5t10 11.5q5 9 10.5 20.5t10.5 24t8 24.5t4 20t-1 16t0 14q3 8 10 13t12 12q5 6 10.5 17t11 24t9.5 25.5t5 22.5q1 6 -2 12t-1 13t9 14.5t13 15.5 q8 12 14 28.5t14.5 30t22.5 21t38 0.5l-1 -2q15 5 26 5h381q38 0 58 -28q20 -26 9 -63l-138 -442q-9 -31 -38 -52.5t-62 -21.5h-436q-5 0 -10 -1t-9 -6q-6 -10 0 -27q8 -21 29.5 -37t42.5 -16h462q14 0 28 10.5t18 23.5l151 482q2 8 2.5 14.5t-0.5 13.5q20 -7 30 -21 q20 -26 9 -63l-138 -442q-9 -32 -38 -53t-62 -21h-462q-20 0 -39 7t-36 19t-30 28.5t-20 35.5q-12 33 -1 62zM244 469q-5 -19 13 -19h300q8 0 15 5.5t9 13.5l12 37q2 8 -1.5 13.5t-11.5 5.5h-300q-8 0 -15.5 -5.5t-9.5 -13.5zM278 581q-2 -8 1.5 -13t11.5 -5h300q8 0 15 5 t10 13l11 38q2 8 -1.5 13.5t-11.5 5.5h-300q-8 0 -15 -5.5t-10 -13.5z" /> +<glyph unicode="" horiz-adv-x="600" d="M0 54v641q0 17 9 30.5t25 20.5q5 2 10 3t11 1h490q5 0 10.5 -1t10.5 -3q16 -7 25 -20.5t9 -30.5v-641q0 -17 -9 -30.5t-25 -19.5q-15 -7 -31.5 -3.5t-27.5 15.5l-207 207l-207 -207q-11 -12 -27.5 -15.5t-31.5 3.5q-16 7 -25 20t-9 30z" /> +<glyph unicode="" d="M0 19v169q0 23 9 43.5t24.5 35.5t36 24t43.5 9h675q23 0 43.5 -9t35.5 -24t24 -35.5t9 -43.5v-169q0 -19 -19 -19h-862q-19 0 -19 19zM131 94q0 -8 5.5 -13t13.5 -5h600q8 0 13.5 5t5.5 13v19q0 8 -5.5 13.5t-13.5 5.5h-600q-8 0 -13.5 -5.5t-5.5 -13.5v-19zM150 356v357 q0 15 11 26t27 11h318v-187q0 -24 16.5 -40.5t39.5 -16.5h188v-150h-600zM562 563v187l188 -187h-188z" /> +<glyph unicode="" d="M0 56v525q0 23 16.5 40t39.5 17h179l28 61q9 21 32.5 36t46.5 15h216q23 0 46.5 -15t32.5 -36l28 -61h179q23 0 39.5 -17t16.5 -40v-525q0 -23 -16.5 -39.5t-39.5 -16.5h-788q-23 0 -39.5 16.5t-16.5 39.5zM216 319q0 -49 18.5 -91.5t50 -74.5t74.5 -50.5t91 -18.5 t91 18.5t74.5 50.5t50 74.5t18.5 91.5q0 48 -18.5 91t-50 74.5t-74.5 50t-91 18.5t-91 -18.5t-74.5 -50t-50 -74.5t-18.5 -91zM291 319q0 33 12.5 62t34 50.5t50.5 34t62 12.5t62 -12.5t50.5 -34t34 -50.5t12.5 -62t-12.5 -62t-34 -51t-50.5 -34.5t-62 -12.5t-62 12.5 t-50.5 34.5t-34 51t-12.5 62z" /> +<glyph unicode="" horiz-adv-x="803" d="M0 0l1 39q5 2 14.5 4t23.5 4q45 9 53 16q8 5 24 33l114 300l135 354h36h26l5 -10l99 -235q16 -38 31 -74t29 -71t25.5 -63.5t20.5 -50.5q6 -14 14 -34t18 -46q11 -32 31 -73q12 -24 17 -28q10 -9 33 -12q12 -1 24 -4.5t26 -8.5q3 -18 3 -27v-5q0 -3 -1 -8q-21 0 -44 1 t-48 3q-26 2 -48.5 3t-42.5 1h-39q-16 0 -26 -1l-97 -5l-28 -1q0 10 0.5 19.5t1.5 18.5l63 13q28 7 33 12q6 4 6 13q0 7 -3 15l-23 56l-44 111l-218 1q-6 -14 -18 -47t-32 -87q-11 -31 -11 -41q0 -13 8 -21q7 -5 19.5 -8.5t30.5 -6.5q7 -2 41 -6v-29q0 -8 -1 -13 q-17 0 -59 2.5t-109 7.5l-24 -4q-21 -4 -40.5 -5.5t-39.5 -1.5h-10zM268 320q66 -1 105.5 -2t51.5 0l14 1q-9 25 -20 54.5t-25 63.5t-25 59.5t-19 42.5z" /> +<glyph unicode="" horiz-adv-x="693" d="M0 0l1 46q13 3 33 6q19 3 34 6.5t27 8.5q4 7 6.5 13t3.5 12q3 16 4 39.5t1 54.5l-1 243q-1 19 -1.5 68t-2.5 130q-2 43 -6 53q-2 4 -6 5q-10 7 -34 8q-11 0 -56 6l-2 41l128 3l187 6h22q4 1 8 1h6q3 0 10.5 -0.5t19.5 -0.5h37q45 0 94 -13q9 -2 21 -6.5t26 -12.5 q31 -15 51 -37q22 -23 32 -51q5 -14 7.5 -28.5t2.5 -30.5q0 -35 -16 -63q-15 -28 -46 -51q-8 -6 -26.5 -15t-47.5 -23q87 -20 131 -71q45 -51 45 -115q0 -35 -14 -79q-11 -32 -35 -57q-32 -35 -69 -53q-38 -17 -100 -29q-34 -6 -97 -5l-97 2q-31 1 -67.5 -1t-79.5 -5 q-12 -1 -45.5 -2t-88.5 -3zM262 693q0 -6 0.5 -15.5t1.5 -21.5q1 -25 2 -58.5t0 -77.5v-48v-38q12 -2 25.5 -3t28.5 -1q86 0 130 32t44 110q0 55 -42 91q-41 37 -126 37q-26 0 -64 -7zM266 223l2 -132q0 -8 5 -21q36 -16 69 -16q64 0 107 20q40 19 60 55q9 18 14 40t5 49 q0 55 -21 88q-29 46 -69 61q-39 16 -122 16q-18 0 -30 -1.5t-20 -3.5v-70v-85z" /> +<glyph unicode="" horiz-adv-x="515" d="M0 0l9 41q6 2 15.5 4.5t22.5 5.5q20 5 34.5 9.5t24.5 9.5q14 19 20 50l14 67l28 131l6 31q11 58 20 87t9 31l15 76l8 31l11 66l4 24v19q-22 11 -72 14q-7 0 -11.5 0.5t-8.5 0.5l10 51l159 -7q15 -1 24 -1h13q17 0 43.5 1t64.5 3q20 2 33.5 3t18.5 1q-1 -5 -1.5 -9.5 t-1.5 -9.5q-2 -5 -4 -11l-3 -14q-24 -8 -54 -15q-32 -8 -51 -15q-6 -16 -12 -43q-3 -12 -4.5 -22t-2.5 -18q-11 -49 -19.5 -86t-13.5 -63l-31 -152l-19 -77l-21 -115l-7 -22v-5q0 -3 1 -8q17 -4 31.5 -6.5t28.5 -4.5q2 0 10.5 -1t22.5 -3q-1 -9 -1.5 -16t-1.5 -13 q-1 -3 -2 -8t-3 -11q-4 0 -7 -0.5t-5 -0.5q-9 -1 -14 -1h-7h-5q-4 0 -9 2q-4 0 -22 2t-51 6l-99 1q-30 0 -88 -6q-19 -2 -31 -3t-18 -1z" /> +<glyph unicode="" d="M0 562q7 18 17 54t22 90q4 16 6.5 26.5t4.5 15.5h28q2 -3 3 -5l2 -4q14 -28 20 -35q8 -2 63 -2q17 0 32.5 0.5t29.5 0.5l10 1l55 1l104 -1h141l27 5q5 4 13 26l2 6q1 3 3 8l21 1h5q3 0 8 -1q1 -19 0.5 -47.5t0.5 -67.5v-49v-28q0 -7 -0.5 -13.5t-1.5 -11.5 q-10 -4 -18 -5.5t-15 -3.5q-13 25 -26 63q-14 40 -18 45q-6 7 -13 10q-5 2 -30 2h-67h-15q-8 0 -17 -2q-3 -21 -3 -35l1 -74v-163l1 -175v-72q0 -35 5 -57q4 -2 10.5 -4t16.5 -4q2 0 10.5 -2t24.5 -6q13 -5 24 -9q2 -10 2 -16v-9v-5q0 -4 -1 -9h-17q-23 0 -43 1t-37 3 t-46.5 3t-72.5 1q-8 0 -28 -2t-53 -5q-14 -1 -22 -1.5t-12 -0.5q0 5 -0.5 8t-0.5 5l-1 12v5q9 15 39 24q46 13 66 24q2 5 3 12.5t2 15.5q2 33 3 86t0 125l-2 209q-1 44 -1 69.5t-2 35.5q0 4 -3 7q-2 3 -6 3q-8 2 -31 2h-62q-44 0 -58 -10q-20 -14 -59 -75q-11 -17 -17 -17 q-11 6 -17.5 11.5t-9.5 9.5zM675.5 112.5q2.5 6.5 15.5 6.5h59v512h-59q-13 0 -15.5 6.5t6.5 16.5l90 90q7 6 16 6q7 0 15 -6l90 -90q9 -10 6.5 -16.5t-16.5 -6.5h-58v-512h58q14 0 16.5 -6.5t-6.5 -15.5l-90 -91q-8 -6 -16 -6t-15 6l-90 91q-9 9 -6.5 15.5z" /> +<glyph unicode="" horiz-adv-x="750" d="M0 114q0 9 6 15l91 90q9 10 15.5 7t6.5 -16v-59h512v59q0 13 6.5 16t16.5 -7l90 -90q6 -6 6 -15t-6 -15l-90 -91q-10 -9 -16.5 -6.5t-6.5 16.5v58h-512v-58q0 -14 -6.5 -16.5t-15.5 6.5l-91 91q-6 6 -6 15zM0 602q7 14 16.5 42.5t21.5 71.5q3 13 5.5 21t4.5 13h27 q4 -6 5 -7q13 -23 18 -28q1 0 17.5 -0.5t38.5 -0.5h44h36h60l9 1h53h99h203l26 3q6 5 12 22q1 2 2 4.5t3 6.5h19h14v-92v-39v-22q0 -6 -0.5 -10.5t-1.5 -9.5q-16 -5 -31 -7q-12 18 -25 50q-13 29 -17 36q-6 5 -13 7q-3 1 -20.5 1.5t-41.5 0.5h-50h-48h-14q-8 0 -17 -1 q-1 -9 -1.5 -16t-0.5 -12l2 -217l-1 -58q0 -30 6 -45q6 -3 26 -6q2 0 10 -2t22 -5q7 -2 13 -3.5t11 -3.5q1 -8 1.5 -12.5t0.5 -6.5t-0.5 -5t-0.5 -7h-16q-46 0 -77 3q-32 3 -115 3q-7 0 -26 -1.5t-51 -3.5q-13 -1 -21 -1.5t-12 -0.5q0 8 -1 10v10v4q10 13 36 19q44 10 64 20 q2 4 3 9.5t2 12.5q0 9 0.5 34.5t0.5 58.5t-0.5 69.5t-1 68t-1 52.5t-0.5 23q0 4 -3 6q-1 1 -6 3q-7 1 -29 1h-60q-10 0 -30.5 -0.5t-41.5 -1t-38 -2t-20 -3.5q-20 -12 -57 -60q-10 -14 -16 -14q-11 5 -17 9.5t-9 7.5z" /> +<glyph unicode="" d="M0 38v56q0 15 11 26t27 11h825q15 0 26 -11t11 -26v-56q0 -16 -11 -27t-26 -11h-825q-16 0 -27 11t-11 27zM0 244v56q0 16 11 27t27 11h525q15 0 26 -11t11 -27v-56q0 -16 -11 -27t-26 -11h-525q-16 0 -27 11t-11 27zM0 450v56q0 16 11 27t27 11h750q15 0 26 -11t11 -27 v-56q0 -16 -11 -26.5t-26 -10.5h-750q-16 0 -27 10.5t-11 26.5zM0 656v57q0 15 11 26t27 11h450q15 0 26 -11t11 -26v-57q0 -15 -11 -26t-26 -11h-450q-16 0 -27 11t-11 26z" /> +<glyph unicode="" d="M0 38v56q0 15 11 26t27 11h825q15 0 26 -11t11 -26v-56q0 -16 -11 -27t-26 -11h-825q-16 0 -27 11t-11 27zM38 450v56q0 16 10.5 27t26.5 11h750q16 0 27 -11t11 -27v-56q0 -16 -11 -26.5t-27 -10.5h-750q-16 0 -26.5 10.5t-10.5 26.5zM150 244v56q0 16 11 27t27 11h525 q15 0 26 -11t11 -27v-56q0 -16 -11 -27t-26 -11h-525q-16 0 -27 11t-11 27zM188 656v57q0 15 10.5 26t26.5 11h450q16 0 27 -11t11 -26v-57q0 -15 -11 -26t-27 -11h-450q-16 0 -26.5 11t-10.5 26z" /> +<glyph unicode="" d="M0 38v56q0 15 11 26t27 11h825q15 0 26 -11t11 -26v-56q0 -16 -11 -27t-26 -11h-825q-16 0 -27 11t-11 27zM75 450v56q0 16 11 27t27 11h750q15 0 26 -11t11 -27v-56q0 -16 -11 -26.5t-26 -10.5h-750q-16 0 -27 10.5t-11 26.5zM300 244v56q0 16 11 27t27 11h525 q15 0 26 -11t11 -27v-56q0 -16 -11 -27t-26 -11h-525q-16 0 -27 11t-11 27zM375 656v57q0 15 11 26t27 11h450q15 0 26 -11t11 -26v-57q0 -15 -11 -26t-26 -11h-450q-16 0 -27 11t-11 26z" /> +<glyph unicode="" d="M0 38v56q0 15 11 26t27 11h825q15 0 26 -11t11 -26v-56q0 -16 -11 -27t-26 -11h-825q-16 0 -27 11t-11 27zM0 244v56q0 16 11 27t27 11h825q15 0 26 -11t11 -27v-56q0 -16 -11 -27t-26 -11h-825q-16 0 -27 11t-11 27zM0 450v56q0 16 11 27t27 11h825q15 0 26 -11t11 -27 v-56q0 -16 -11 -26.5t-26 -10.5h-825q-16 0 -27 10.5t-11 26.5zM0 656v57q0 15 11 26t27 11h825q15 0 26 -11t11 -26v-57q0 -15 -11 -26t-26 -11h-825q-16 0 -27 11t-11 26z" /> +<glyph unicode="" d="M0 38v56q0 15 11 26t27 11h75q15 0 26 -11t11 -26v-56q0 -16 -11 -27t-26 -11h-75q-16 0 -27 11t-11 27zM0 244v56q0 16 11 27t27 11h75q15 0 26 -11t11 -27v-56q0 -16 -11 -27t-26 -11h-75q-16 0 -27 11t-11 27zM0 450v56q0 16 11 27t27 11h75q15 0 26 -11t11 -27v-56 q0 -16 -11 -26.5t-26 -10.5h-75q-16 0 -27 10.5t-11 26.5zM0 656v57q0 15 11 26t27 11h75q15 0 26 -11t11 -26v-57q0 -15 -11 -26t-26 -11h-75q-16 0 -27 11t-11 26zM225 38v56q0 15 11 26t27 11h600q15 0 26 -11t11 -26v-56q0 -16 -11 -27t-26 -11h-600q-16 0 -27 11 t-11 27zM225 244v56q0 16 11 27t27 11h600q15 0 26 -11t11 -27v-56q0 -16 -11 -27t-26 -11h-600q-16 0 -27 11t-11 27zM225 450v56q0 16 11 27t27 11h600q15 0 26 -11t11 -27v-56q0 -16 -11 -26.5t-26 -10.5h-600q-16 0 -27 10.5t-11 26.5zM225 656v57q0 15 11 26t27 11h600 q15 0 26 -11t11 -26v-57q0 -15 -11 -26t-26 -11h-600q-16 0 -27 11t-11 26z" /> +<glyph unicode="" d="M0 369v37q0 19 19 19h104v75q0 15 8 18t19 -8l105 -105q8 -8 8 -18q0 -9 -8 -17l-105 -105q-11 -11 -19 -8t-8 19v74h-104q-19 0 -19 19zM300 19v712q0 19 19 19h37q19 0 19 -19v-712q0 -19 -19 -19h-37q-19 0 -19 19zM450 38v56q0 15 11 26t27 11h375q15 0 26 -11 t11 -26v-56q0 -16 -11 -27t-26 -11h-375q-16 0 -27 11t-11 27zM450 244v56q0 16 11 27t27 11h300q15 0 26 -11t11 -27v-56q0 -16 -11 -27t-26 -11h-300q-16 0 -27 11t-11 27zM450 450v56q0 16 11 27t27 11h337q16 0 27 -11t11 -27v-56q0 -16 -11 -26.5t-27 -10.5h-337 q-16 0 -27 10.5t-11 26.5zM450 656v57q0 15 11 26t27 11h262q16 0 27 -11t11 -26v-57q0 -15 -11 -26t-27 -11h-262q-16 0 -27 11t-11 26z" /> +<glyph unicode="" d="M0 38v56q0 15 11 26t26 11h375q16 0 27 -11t11 -26v-56q0 -16 -11 -27t-27 -11h-375q-15 0 -26 11t-11 27zM0 244v56q0 16 11 27t26 11h300q16 0 27 -11t11 -27v-56q0 -16 -11 -27t-27 -11h-300q-15 0 -26 11t-11 27zM0 450v56q0 16 11 27t26 11h338q15 0 26 -11t11 -27 v-56q0 -16 -11 -26.5t-26 -10.5h-338q-15 0 -26 10.5t-11 26.5zM0 656v57q0 15 11 26t26 11h263q15 0 26 -11t11 -26v-57q0 -15 -11 -26t-26 -11h-263q-15 0 -26 11t-11 26zM525 19v712q0 19 19 19h37q8 0 13.5 -5.5t5.5 -13.5v-712q0 -8 -5.5 -13.5t-13.5 -5.5h-37 q-19 0 -19 19zM637 363q0 8 7 17l106 105q11 11 18.5 8t7.5 -19v-74h105q8 0 13.5 -5.5t5.5 -13.5v-37q0 -8 -5.5 -13.5t-13.5 -5.5h-105v-75q0 -15 -7.5 -18.5t-18.5 7.5l-106 106q-7 9 -7 18z" /> +<glyph unicode="" d="M-2 113v525q0 23 9 43.5t24.5 35.5t36 24t43.5 9h375q23 0 43.5 -9t36 -24t24.5 -35.5t9 -43.5v-169l251 272q9 9 20 9q5 0 11 -2q18 -8 18 -28v-690q0 -20 -18 -28q-17 -7 -31 7l-251 272v-168q0 -23 -9 -43.5t-24.5 -36t-36 -24.5t-43.5 -9h-375q-23 0 -43.5 9 t-36 24.5t-24.5 36t-9 43.5z" /> +<glyph unicode="" d="M0 56v638q0 23 16.5 39.5t39.5 16.5h788q23 0 39.5 -16.5t16.5 -39.5v-638q0 -23 -16.5 -39.5t-39.5 -16.5h-788q-23 0 -39.5 16.5t-16.5 39.5zM75 75h750v600h-750v-600zM150 150v51l135 176l92 -76l173 262l200 -207v-206h-600zM150 524q0 32 22 54t54 22q31 0 53 -22 t22 -54q0 -31 -22 -53t-53 -22q-32 0 -54 22t-22 53z" /> +<glyph unicode="" horiz-adv-x="750" d="M0 0l67 204l423 423l137 -137l-423 -423zM140 199q0 -6 5 -11q4 -4 11 -4q6 0 10 4l337 337q10 10 0 21q-5 5 -11 5t-10 -5l-337 -336q-5 -5 -5 -11zM538 675l58 58q17 17 41 17t41 -17l28 -27l27 -28q17 -17 17 -41t-17 -41l-58 -58z" /> +<glyph unicode="" horiz-adv-x="530" d="M0 485q0 55 21 103t57 84t84 57t103 21t103 -21t84 -57t57 -84t21 -103q0 -40 -12 -75t-30 -67l-179 -311q-18 -32 -44 -32t-44 32l-179 311q-18 32 -30 67.5t-12 74.5zM134 485q0 -27 10 -51t28 -42t42 -28t51 -10t51 10t41.5 28t28 42t10.5 51t-10.5 51t-28 41.5 t-41.5 28t-51 10.5t-51 -10.5t-42 -28t-28 -41.5t-10 -51z" /> +<glyph unicode="" horiz-adv-x="750" d="M0 375q0 78 29.5 146t80.5 119t119 80.5t146 29.5t146 -29.5t119 -80.5t80.5 -119t29.5 -146t-29.5 -146t-80.5 -119t-119 -80.5t-146 -29.5t-146 29.5t-119 80.5t-80.5 119t-29.5 146zM113 375q0 -54 20.5 -102t56 -83.5t83.5 -56t102 -20.5v525q-54 0 -102 -20.5 t-83.5 -56.5t-56 -84t-20.5 -102z" /> +<glyph unicode="" horiz-adv-x="531" d="M0 266q0 39 11 75t31 67q10 16 33 47t50.5 72.5t53.5 90.5t42 102q5 17 17.5 24.5t26.5 5.5q15 2 27.5 -5.5t17.5 -24.5q16 -53 42 -102t53.5 -90.5t50.5 -72.5t33 -47q20 -31 31 -67t11 -75q0 -55 -21 -103.5t-57 -84.5t-84.5 -57t-103.5 -21t-103 21t-84 57t-57 84.5 t-21 103.5zM116 207q0 -28 19.5 -47t47.5 -19q27 0 46.5 19t19.5 47q0 18 -10 36q-3 4 -9 11.5t-12.5 18t-13 23t-10.5 25.5q-4 9 -11 7q-9 2 -11 -7q-4 -13 -11 -25.5t-13.5 -23t-12.5 -18t-8 -11.5q-11 -17 -11 -36z" /> +<glyph unicode="" d="M0 150v450q0 31 12 58.5t32 47.5t47.5 32t58.5 12h525q2 0 5 -0.5t5 -0.5l-93 -93h-442q-23 0 -39.5 -16.5t-16.5 -39.5v-450q0 -23 16.5 -39.5t39.5 -16.5h525q23 0 39.5 16.5t16.5 39.5v217l94 94v-311q0 -31 -12 -58t-32.5 -47.5t-47.5 -32.5t-58 -12h-525 q-31 0 -58.5 12t-47.5 32.5t-32 47.5t-12 58zM308 158l53 161l318 318l108 -108l-318 -318zM423 307q3 -4 8 -4t8 4l250 249q9 9 0 17t-17 0l-249 -249q-9 -9 0 -17zM733 691l45 46q14 14 33 14t32 -14l22 -22l22 -22q13 -14 13.5 -32.5t-13.5 -32.5l-46 -45z" /> +<glyph unicode="" d="M0 150v450q0 31 12 58.5t32 47.5t47.5 32t58.5 12h408q-3 -15 -3 -31v-25q-80 -10 -151 -38h-254q-23 0 -39.5 -16.5t-16.5 -39.5v-450q0 -23 16.5 -39.5t39.5 -16.5h525q23 0 39.5 16.5t16.5 39.5v54q8 5 15.5 10.5t15.5 13.5l63 62v-140q0 -31 -12 -58t-32.5 -47.5 t-47.5 -32.5t-58 -12h-525q-31 0 -58.5 12t-47.5 32.5t-32 47.5t-12 58zM188 190v18q0 81 27.5 152.5t84.5 125t143.5 84.5t204.5 32v113q0 28 14 34t34 -14l191 -191q13 -12 13 -32q0 -19 -13 -31l-191 -191q-20 -20 -34 -14t-14 34v127q-101 0 -178 -21t-130 -57t-83 -85 t-38 -105q-2 -13 -15 -13q-12 0 -14 13q-2 11 -2 21z" /> +<glyph unicode="" d="M0 150v450q0 31 12 58.5t32 47.5t47.5 32t58.5 12h525q13 0 25 -3l-91 -91h-459q-23 0 -39.5 -16.5t-16.5 -39.5v-450q0 -23 16.5 -39.5t39.5 -16.5h525q23 0 39.5 16.5t16.5 39.5v159l94 94v-253q0 -31 -12 -58t-32.5 -47.5t-47.5 -32.5t-58 -12h-525q-31 0 -58.5 12 t-47.5 32.5t-32 47.5t-12 58zM188 472q0 16 11 27l48 48q11 11 27 11t27 -11l166 -166l319 320q11 11 27.5 11t27.5 -11l48 -48q11 -11 11 -27t-11 -27l-347 -347l-48 -48q-11 -11 -27 -11t-27 11l-49 48l-192 193q-11 11 -11 27z" /> +<glyph unicode="" horiz-adv-x="750" d="M0 375q0 12 8 20l121 120q12 13 21 9t9 -21v-80h169v168h-81q-17 0 -21 9t9 21l120 121q8 8 20 8t20 -8l121 -121q12 -12 8.5 -21t-21.5 -9h-81v-168h169v80q0 17 9 21t21 -9l121 -120q8 -8 8 -20t-8 -20l-121 -120q-12 -13 -21 -9.5t-9 21.5v83h-169v-171h81 q18 0 21.5 -9t-8.5 -21l-121 -121q-8 -8 -20 -8t-20 8l-120 121q-13 12 -9 21t21 9h81v171h-169v-83q0 -17 -9 -21t-21 9l-121 120q-8 8 -8 20z" /> +<glyph unicode="" horiz-adv-x="525" d="M0 37q0 -15 11 -26t26 -11h75q16 0 27 11t11 26v675q0 16 -11 27t-27 11h-75q-15 0 -26 -11t-11 -27v-675zM150 375q0 13 8 21l319 345q7 9 20 9q3 0 11 -2q17 -9 17 -29v-689q0 -20 -17 -28q-19 -7 -31 7l-319 344q-8 9 -8 22z" /> +<glyph unicode="" d="M0 37q0 -15 11 -26t26 -11h75q16 0 27 11t11 26v675q0 16 -11 27t-27 11h-75q-15 0 -26 -11t-11 -27v-675zM150 375q0 13 8 21l319 345q7 9 20 9q3 0 11 -2q17 -9 17 -29v-689q0 -20 -17 -28q-19 -7 -31 7l-319 344q-8 9 -8 22zM525 375q0 13 8 21l319 345q7 9 20 9 q3 0 11 -2q17 -9 17 -29v-689q0 -20 -17 -28q-19 -7 -31 7l-319 344q-8 9 -8 22z" /> +<glyph unicode="" horiz-adv-x="750" d="M0 374.5q0 12.5 8 21.5l319 345q7 9 20 9q5 0 11 -3q17 -7 17 -28v-689q0 -20 -17 -28q-18 -8 -31 7l-319 344q-8 9 -8 21.5zM375 374.5q0 12.5 8 21.5l319 345q7 9 20 9q5 0 11 -3q17 -7 17 -28v-689q0 -20 -17 -28q-18 -8 -31 7l-319 344q-8 9 -8 21.5z" /> +<glyph unicode="" horiz-adv-x="659" d="M0 34v682q0 19 17 29q18 11 34 0l591 -340q17 -12 17 -30t-17 -30l-591 -340q-8 -5 -17 -5t-17 5q-17 10 -17 29z" /> +<glyph unicode="" horiz-adv-x="750" d="M0 34v682q0 14 10 24t24 10h239q14 0 24 -10t10 -24v-682q0 -14 -10 -24t-24 -10h-239q-14 0 -24 10t-10 24zM443 34v682q0 14 10 24t24 10h239q14 0 24 -10t10 -24v-682q0 -14 -10 -24t-24 -10h-239q-14 0 -24 10t-10 24z" /> +<glyph unicode="" horiz-adv-x="750" d="M0 34v682q0 14 10 24t24 10h682q14 0 24 -10t10 -24v-682q0 -14 -10 -24t-24 -10h-682q-14 0 -24 10t-10 24z" /> +<glyph unicode="" horiz-adv-x="750" d="M0 30v690q0 19 17 28q19 7 31 -7l319 -344q8 -9 8 -22t-8 -22l-319 -344q-8 -9 -20 -9q-3 0 -11 2q-17 8 -17 28zM375 30v690q0 19 17 28q19 7 31 -7l319 -344q8 -9 8 -22t-8 -22l-319 -344q-8 -9 -20 -9q-3 0 -11 2q-17 8 -17 28z" /> +<glyph unicode="" d="M0 30v690q0 19 17 28q19 7 31 -7l319 -344q8 -9 8 -22t-8 -22l-319 -344q-8 -9 -20 -9q-3 0 -11 2q-17 8 -17 28zM375 30v690q0 19 17 28q19 7 31 -7l319 -344q8 -9 8 -22t-8 -22l-319 -344q-8 -9 -20 -9q-3 0 -11 2q-17 8 -17 28zM750 37q0 -15 11 -26t26 -11h75 q16 0 27 11t11 26v675q0 16 -11 27t-27 11h-75q-15 0 -26 -11t-11 -27v-675z" /> +<glyph unicode="" horiz-adv-x="525" d="M0 30v690q0 19 17 28q19 7 31 -7l319 -344q8 -9 8 -22t-8 -22l-319 -344q-8 -9 -20 -9q-3 0 -11 2q-17 8 -17 28zM375 37q0 -15 11 -26t26 -11h75q16 0 27 11t11 26v675q0 16 -11 27t-27 11h-75q-15 0 -26 -11t-11 -27v-675z" /> +<glyph unicode="" horiz-adv-x="750" d="M0 34v97q0 14 10 24t24 10h682q14 0 24 -10t10 -24v-97q0 -14 -10 -24t-24 -10h-682q-14 0 -24 10t-10 24zM3 290q-9 21 7 37l341 341q10 10 24 10t24 -10l341 -341q16 -16 7 -37q-8 -21 -31 -21h-682q-23 0 -31 21z" /> +<glyph unicode="" horiz-adv-x="471" d="M0 373.5q0 18.5 14 32.5l328 329q14 14 33 14t33 -14l49 -49q14 -14 14 -33t-14 -33l-248 -249l248 -244q14 -14 14 -32.5t-14 -32.5l-49 -50q-14 -14 -33 -14t-33 14l-328 329q-14 14 -14 32.5z" /> +<glyph unicode="" horiz-adv-x="471" d="M0 95q0 19 14 33l248 248l-248 245q-14 14 -14 32.5t14 32.5l49 50q14 14 33 14t33 -14l328 -329q14 -14 14 -33t-14 -33l-328 -328q-14 -14 -33 -14t-33 14l-49 49q-14 14 -14 33z" /> +<glyph unicode="" horiz-adv-x="750" d="M0 375q0 78 29.5 146t80.5 119t119 80.5t146 29.5t146 -29.5t119 -80.5t80.5 -119t29.5 -146t-29.5 -146t-80.5 -119t-119 -80.5t-146 -29.5t-146 29.5t-119 80.5t-80.5 119t-29.5 146zM159 338q0 -7 4.5 -11.5t10.5 -4.5h147v-161q0 -7 4.5 -11.5t10.5 -4.5h78 q6 0 10.5 4.5t4.5 11.5v161h147q6 0 10.5 4.5t4.5 11.5v74q0 6 -4.5 10.5t-10.5 4.5h-147v162q0 7 -4.5 11.5t-10.5 4.5h-78q-6 0 -10.5 -4.5t-4.5 -11.5v-162h-147q-6 0 -10.5 -4.5t-4.5 -10.5v-74z" /> +<glyph unicode="" horiz-adv-x="750" d="M0 375q0 78 29.5 146t80.5 119t119 80.5t146 29.5t146 -29.5t119 -80.5t80.5 -119t29.5 -146t-29.5 -146t-80.5 -119t-119 -80.5t-146 -29.5t-146 29.5t-119 80.5t-80.5 119t-29.5 146zM159 338q0 -7 4.5 -11.5t10.5 -4.5h402q6 0 10.5 4.5t4.5 11.5v74q0 6 -4.5 10.5 t-10.5 4.5h-402q-6 0 -10.5 -4.5t-4.5 -10.5v-74z" /> +<glyph unicode="" horiz-adv-x="750" d="M0 376q0 72 27.5 141t82.5 124t124 82t141 27t141 -27t124 -82t82.5 -124t27.5 -141t-27.5 -141t-82.5 -124t-124 -82.5t-141 -27.5t-141 27.5t-124 82.5t-82.5 124t-27.5 141zM185 240l55 -54q5 -5 11 -5t11 5l114 114l103 -104q5 -5 11 -5t11 5l53 53q11 11 0 22 l-104 103l115 115q11 11 0 22l-55 55q-11 11 -22 0l-114 -115l-104 104q-11 11 -22 0l-52 -53q-5 -5 -5 -11t5 -11l103 -103l-114 -115q-10 -10 0 -22z" /> +<glyph unicode="" horiz-adv-x="750" d="M0 375q0 78 29.5 146t80.5 119t119 80.5t146 29.5t146 -29.5t119 -80.5t80.5 -119t29.5 -146t-29.5 -146t-80.5 -119t-119 -80.5t-146 -29.5t-146 29.5t-119 80.5t-80.5 119t-29.5 146zM112 351.5q0 -9.5 7 -16.5l150 -150q7 -6 18 -11t21 -5h25q10 0 21 5t18 11l259 259 q7 7 7 16.5t-7 15.5l-50 50q-6 7 -15.5 7t-16.5 -7l-212 -213q-7 -7 -16.5 -7t-15.5 7l-104 104q-7 7 -16.5 7t-15.5 -7l-50 -49q-7 -7 -7 -16.5z" /> +<glyph unicode="" horiz-adv-x="750" d="M0 375q0 78 29.5 146t80.5 119t119 80.5t146 29.5t146 -29.5t119 -80.5t80.5 -119t29.5 -146t-29.5 -146t-80.5 -119t-119 -80.5t-146 -29.5t-146 29.5t-119 80.5t-80.5 119t-29.5 146zM250 531l44 -55q6 -4 10 -5q6 0 10 4q8 6 18 11q8 4 18.5 7.5t21.5 3.5 q20 0 33 -10.5t13 -26.5q0 -17 -11.5 -30.5t-28.5 -28.5q-11 -9 -22 -19.5t-20 -24t-15 -30t-6 -37.5v-30q0 -5 4.5 -9.5t9.5 -4.5h77q6 0 10 4.5t4 9.5v25q0 18 12 31t29 28q12 10 24 21.5t21.5 26.5t16 33t6.5 42q0 32 -13 57t-34.5 41.5t-48.5 25t-54 8.5 q-30 0 -53.5 -7.5t-40 -16.5t-25 -17t-9.5 -9q-9 -9 -1 -18zM315 132q0 -5 4.5 -9.5t9.5 -4.5h77q6 0 10 4.5t4 9.5v74q0 14 -14 14h-77q-5 0 -9.5 -4t-4.5 -10v-74z" /> +<glyph unicode="" horiz-adv-x="750" d="M0 375q0 78 29.5 146t80.5 119t119 80.5t146 29.5t146 -29.5t119 -80.5t80.5 -119t29.5 -146t-29.5 -146t-80.5 -119t-119 -80.5t-146 -29.5t-146 29.5t-119 80.5t-80.5 119t-29.5 146zM269 418q0 -14 14 -14h40v-192h-37q-5 0 -9.5 -4.5t-4.5 -9.5v-66q0 -5 4.5 -9.5 t9.5 -4.5h189q5 0 9.5 4.5t4.5 9.5v66q0 5 -4.5 9.5t-9.5 4.5h-36v271q0 6 -4.5 10t-9.5 4h-142q-14 0 -14 -14v-65zM322 555q0 -6 4.5 -10.5t10.5 -4.5h88q5 0 9.5 4.5t4.5 10.5v77q0 6 -4.5 10t-9.5 4h-88q-6 0 -10.5 -4t-4.5 -10v-77z" /> +<glyph unicode="" horiz-adv-x="750" d="M0 338v75q0 8 5.5 13t13.5 5h80q9 41 29 77.5t48.5 65t65 48.5t77.5 29v80q0 19 19 19h75q8 0 13 -5.5t5 -13.5v-80q41 -9 77.5 -29t65 -48.5t48.5 -65t29 -77.5h80q8 0 13.5 -5t5.5 -13v-75q0 -19 -19 -19h-80q-9 -41 -29 -77.5t-48.5 -65t-65 -48.5t-77.5 -29v-80 q0 -8 -5 -13.5t-13 -5.5h-75q-19 0 -19 19v80q-41 9 -77.5 29t-65 48.5t-48.5 65t-29 77.5h-80q-19 0 -19 19zM178 319q14 -52 51.5 -89.5t89.5 -51.5v85q0 8 5.5 13t13.5 5h75q8 0 13 -5t5 -13v-85q52 14 89.5 51.5t51.5 89.5h-84q-19 0 -19 19v75q0 8 5.5 13t13.5 5h84 q-14 52 -51.5 89.5t-89.5 51.5v-84q0 -8 -5 -13.5t-13 -5.5h-75q-19 0 -19 19v84q-52 -14 -89.5 -51.5t-51.5 -89.5h85q8 0 13 -5t5 -13v-75q0 -8 -5 -13.5t-13 -5.5h-85z" /> +<glyph unicode="" horiz-adv-x="750" d="M0 375q0 78 29.5 146t80.5 119t119 80.5t146 29.5t146 -29.5t119 -80.5t80.5 -119t29.5 -146t-29.5 -146t-80.5 -119t-119 -80.5t-146 -29.5t-146 29.5t-119 80.5t-80.5 119t-29.5 146zM113 375q0 -54 20.5 -102t56 -83.5t83.5 -56t102 -20.5t102 20.5t84 56t56.5 83.5 t20.5 102t-20.5 102t-56.5 84t-84 56.5t-102 20.5t-102 -20.5t-83.5 -56.5t-56 -84t-20.5 -102zM212 466q0 8 5 14l53 53q6 5 14 5t13 -5l78 -78l78 78q6 5 14 5t13 -5l53 -53q5 -6 5 -14t-5 -13l-78 -78l78 -78q12 -14 0 -27l-53 -53q-14 -12 -27 0l-78 78l-78 -78 q-5 -5 -13 -5t-14 5l-53 53q-12 13 0 27l79 78l-79 78q-5 5 -5 13z" /> +<glyph unicode="" horiz-adv-x="750" d="M0 375q0 78 29.5 146t80.5 119t119 80.5t146 29.5t146 -29.5t119 -80.5t80.5 -119t29.5 -146t-29.5 -146t-80.5 -119t-119 -80.5t-146 -29.5t-146 29.5t-119 80.5t-80.5 119t-29.5 146zM113 375q0 -54 20.5 -102t56 -83.5t83.5 -56t102 -20.5t102 20.5t84 56t56.5 83.5 t20.5 102t-20.5 102t-56.5 84t-84 56.5t-102 20.5t-102 -20.5t-83.5 -56.5t-56 -84t-20.5 -102zM156 352q0 8 5 13l53 53q5 5 13 5t14 -5l83 -84q13 -12 27 0l158 159q6 5 14 5t13 -5l53 -53q5 -5 5 -13t-5 -14l-192 -192q-6 -5 -15 -9t-17 -4h-55q-8 0 -17 4t-15 9 l-117 117q-5 6 -5 14z" /> +<glyph unicode="" horiz-adv-x="750" d="M0 375q0 78 29.5 146t80.5 119t119 80.5t146 29.5t146 -29.5t119 -80.5t80.5 -119t29.5 -146t-29.5 -146t-80.5 -119t-119 -80.5t-146 -29.5t-146 29.5t-119 80.5t-80.5 119t-29.5 146zM113 375q0 -39 10.5 -74.5t30.5 -66.5l362 362q-31 20 -66.5 31t-74.5 11 q-54 0 -102 -20.5t-83.5 -56.5t-56 -84t-20.5 -102zM234 154q31 -20 66.5 -30.5t74.5 -10.5q54 0 102 20.5t84 56t56.5 83.5t20.5 102q0 39 -11 74.5t-31 66.5z" /> +<glyph unicode="" horiz-adv-x="750" d="M0 375q0 19 14 33l328 329q14 14 33 14t33 -14l49 -49q14 -14 14 -33t-14 -33l-165 -165h411q20 0 33.5 -13.5t13.5 -33.5v-70q0 -19 -13.5 -32.5t-32.5 -13.5h-412l165 -165q14 -14 14 -33t-14 -33l-49 -49q-14 -14 -33 -14t-33 14l-328 328q-14 14 -14 33z" /> +<glyph unicode="" horiz-adv-x="750" d="M0 341v70q0 19 13.5 32.5t32.5 13.5h412l-165 165q-14 14 -14 33t14 33l49 49q14 14 33 14t33 -14l328 -329q14 -14 14 -32.5t-14 -32.5l-328 -329q-14 -14 -33 -14t-33 14l-49 49q-14 14 -14 33t14 33l165 165h-412q-19 0 -32.5 13.5t-13.5 33.5z" /> +<glyph unicode="" horiz-adv-x="750" d="M-0.5 375q-0.5 19 13.5 33l329 328q14 14 33 14t33 -14l328 -328q14 -14 14 -33t-14 -33l-49 -49q-14 -14 -32.5 -14t-32.5 14l-166 165v-412q0 -19 -13.5 -32.5t-32.5 -13.5h-70q-20 0 -33 13.5t-13 32.5v412l-165 -165q-14 -14 -33 -14t-33 14l-49 49q-14 14 -14.5 33z " /> +<glyph unicode="" horiz-adv-x="750" d="M0 374q0 19 14 33l49 49q14 14 33 14t33 -14l165 -165v412q0 19 13.5 32.5t32.5 13.5h70q20 0 33 -13.5t13 -32.5v-412l166 165q14 14 32.5 14t32.5 -14l50 -49q14 -14 14 -33t-14 -33l-329 -328q-14 -14 -33 -14t-33 14l-328 328q-14 14 -14 33z" /> +<glyph unicode="" d="M0 66q0 102 35 192t106.5 157.5t181 107t259.5 40.5v143q0 35 17.5 42.5t43.5 -17.5l240 -241q17 -16 17 -40q0 -23 -17 -40l-240 -241q-25 -25 -43 -17.5t-18 42.5v161q-128 -1 -225 -27.5t-164 -72t-105 -107t-48 -132.5q-2 -16 -18 -16h-1q-16 0 -18 16q-3 25 -3 50z " /> +<glyph unicode="" horiz-adv-x="750" d="M0 42v255q0 26 13 31.5t32 -12.5l81 -81l134 134q6 6 15 6t16 -6l78 -78q6 -7 6 -16t-6 -15l-134 -134l81 -81q19 -19 13 -32t-32 -13h-254q-18 0 -30 12q-13 13 -13 30zM375 475q0 9 6 15l134 134l-81 81q-19 19 -13 32t32 13h254q18 0 30 -12q13 -13 13 -30v-255 q0 -26 -13 -31.5t-32 12.5l-81 81l-134 -133q-6 -7 -15 -7t-16 7l-78 77q-6 7 -6 16z" /> +<glyph unicode="" horiz-adv-x="750" d="M0 99q0 9 6 16l134 133l-81 81q-19 19 -13 32t32 13h254q19 0 30 -12q13 -13 13 -30v-255q0 -26 -13 -31.5t-32 13.5l-81 81l-134 -134q-6 -7 -15 -7t-16 7l-78 78q-6 6 -6 15zM375 417v255q0 26 13 31.5t32 -13.5l81 -81l134 134q6 7 15 7t16 -7l78 -78q6 -6 6 -15 t-6 -16l-134 -133l81 -81q19 -19 13 -32t-32 -13h-254q-20 0 -30 12q-13 13 -13 30z" /> +<glyph unicode="" horiz-adv-x="750" d="M0 340v70q0 19 13.5 32.5t32.5 13.5h248v247q0 20 13 33.5t33 13.5h70q19 0 32.5 -13.5t13.5 -32.5v-248h248q19 0 32.5 -13.5t13.5 -32.5v-70q0 -19 -13.5 -32.5t-32.5 -13.5h-248v-247q0 -20 -13.5 -33.5t-32.5 -13.5h-70q-19 0 -32.5 13.5t-13.5 32.5v248h-247 q-20 0 -33.5 13t-13.5 33z" /> +<glyph unicode="" horiz-adv-x="750" d="M0 340v70q0 19 13.5 32.5t32.5 13.5h658q19 0 32.5 -13.5t13.5 -32.5v-70q0 -19 -13.5 -32.5t-32.5 -13.5h-657q-20 0 -33.5 13t-13.5 33z" /> +<glyph unicode="" horiz-adv-x="697" d="M1 497q-5 18 5 35l35 61q10 17 28.5 21.5t35.5 -4.5l162 -94v187q0 20 13.5 33.5t33.5 13.5h69q20 0 33.5 -13.5t13.5 -32.5v-188l162 94q17 9 35.5 4.5t28.5 -21.5l34 -61q10 -17 5.5 -35t-21.5 -28l-163 -94l163 -94q17 -10 21.5 -28t-4.5 -35l-35 -61 q-10 -17 -28.5 -21.5t-35.5 4.5l-162 94v-187q0 -20 -13.5 -33.5t-33.5 -13.5h-69q-20 0 -33.5 13.5t-13.5 32.5v188l-162 -94q-17 -10 -35.5 -5t-28.5 22l-35 61q-9 17 -4.5 35t21.5 28l163 94l-163 94q-17 10 -22 28z" /> +<glyph unicode="" horiz-adv-x="750" d="M0 375q0 78 29.5 146t80.5 119t119 80.5t146 29.5t146 -29.5t119 -80.5t80.5 -119t29.5 -146t-29.5 -146t-80.5 -119t-119 -80.5t-146 -29.5t-146 29.5t-119 80.5t-80.5 119t-29.5 146zM316 613l6 -347q2 -14 15 -14h76q14 0 14 14l7 347q1 5 -4 10q-3 4 -10 4h-90 q-7 0 -10 -4q-4 -4 -4 -10zM319 125q0 -14 14 -14h85q5 0 9.5 4t4.5 10v82q0 6 -4.5 10t-9.5 4h-85q-14 0 -14 -14v-82z" /> +<glyph unicode="" d="M0 281v188q0 8 5.5 13.5t13.5 5.5h258q-27 0 -51 10t-42 28t-28.5 42t-10.5 51t10.5 51t28.5 41.5t42 28t51 10.5q29 0 55 -11.5t43 -33.5l75 -97l75 97q17 22 43 33.5t55 11.5q27 0 51 -10.5t42 -28t28.5 -41.5t10.5 -51t-10.5 -51t-28.5 -42t-42 -28t-51 -10h258 q8 0 13.5 -5.5t5.5 -13.5v-188q0 -8 -5.5 -13t-13.5 -5h-56v-207q0 -23 -16.5 -39.5t-39.5 -16.5h-638q-23 0 -39.5 16.5t-16.5 39.5v207h-56q-8 0 -13.5 5t-5.5 13zM220 619q0 -23 17 -39.5t40 -16.5h113l-73 94q-5 5 -15 11.5t-25 6.5q-23 0 -40 -16.5t-17 -39.5zM356 105 q0 -15 11 -26t27 -11h112q16 0 27 11t11 26v383h-188v-383zM509 563h114q23 0 40 16.5t17 39.5t-17 39.5t-40 16.5q-15 0 -25 -6.5t-15 -11.5z" /> +<glyph unicode="" d="M3 78q9 25 25.5 41.5t33.5 30.5q14 11 24 20.5t13 20.5q1 2 0 5t-5 11q-2 6 -5 13.5t-5 16.5q-12 75 6.5 139t56.5 114.5t91 86.5t111 56q38 14 83.5 16.5t95.5 3.5q28 0 59.5 1t60.5 5.5t53.5 13.5t39.5 25q10 10 18.5 19.5t18 16.5t20.5 11.5t27 4.5q23 0 33 -21 q62 -121 32 -283q-42 -228 -272 -347q-110 -57 -220 -57q-36 0 -72.5 6t-71.5 19q-11 4 -21.5 9.5t-21.5 10.5q-13 8 -26.5 14.5t-22.5 7.5q-5 -1 -11.5 -8t-13 -16.5t-12.5 -19t-10 -15.5q-6 -11 -12 -20t-11 -16q-11 -14 -29 -14h-2q-28 2 -39 17.5t-14 23.5q-13 18 -5 37 zM188.5 253.5q1.5 -15.5 13.5 -26.5q10 -9 24 -9q18 0 28 13q42 48 85.5 82t90.5 54.5t99.5 29t114.5 6.5q15 -2 26.5 9.5t12.5 26.5q0 16 -10.5 27.5t-26.5 11.5q-69 3 -130 -7t-116 -34t-104.5 -63t-97.5 -94q-11 -11 -9.5 -26.5z" /> +<glyph unicode="" horiz-adv-x="675" d="M0 214q0 58 30.5 119.5t82.5 111.5q-11 -75 0.5 -120.5t30.5 -71.5q22 -30 53 -44q-24 105 -14 204q4 42 15.5 87.5t34 90t58.5 85.5t89 74q-23 -49 -22 -90t11 -71q11 -35 34 -64q16 -19 30.5 -37.5t25 -42.5t16.5 -56.5t6 -78.5q-9 20 -27 32t-41 12q-32 0 -53.5 -22 t-21.5 -53q0 -16 5.5 -30t17 -25t30 -17t44.5 -6q44 4 77 31q13 12 25.5 29.5t20.5 43t10 60t-5 80.5h-1q52 -50 82.5 -111.5t30.5 -119.5q0 -54 -26.5 -94t-72.5 -66.5t-107 -40t-131 -13.5t-131.5 13.5t-107.5 40t-72.5 66.5t-26.5 94z" /> +<glyph unicode="" d="M0 352.5q0 21.5 12 40.5q38 61 87 109.5t105.5 82t118.5 51t127 17.5q66 0 128 -17.5t118 -50.5t105 -81.5t88 -110.5q11 -19 11 -40.5t-11 -39.5q-39 -62 -88 -110.5t-105 -81.5t-118 -50.5t-128 -17.5q-65 0 -127 17.5t-118.5 51t-105.5 82t-87 109.5q-12 18 -12 39.5z M75 353q32 -51 73 -93t89 -71t101.5 -45t111.5 -16t111.5 16t101.5 45t89 71t73 93q-39 63 -91.5 110.5t-115.5 76.5q25 -29 39 -65t14 -78q0 -47 -17.5 -87.5t-48.5 -71.5t-72 -48.5t-87 -17.5q-47 0 -87.5 17.5t-71.5 48.5t-48.5 71.5t-17.5 87.5q0 38 12.5 72.5 t33.5 62.5q-57 -29 -106 -74.5t-86 -104.5zM300 397q0 -11 8 -19.5t20 -8.5t20 8.5t8 19.5q0 38 26 64t64 26q12 0 20 8.5t8 19.5q0 12 -8 20t-20 8q-30 0 -57 -11.5t-46.5 -31t-31 -46.5t-11.5 -57z" /> +<glyph unicode="" d="M0 374.5q0 21.5 12 40.5q38 61 87 109.5t105.5 82t118.5 51t127 17.5q26 0 51.5 -3.5t50.5 -8.5l43 77q4 7 12 9q6 3 14 -1l65 -37q7 -4 9.5 -11.5t-1.5 -14.5l-378 -675q-3 -7 -11 -9q-2 -1 -5 -1t-9 2l-66 37q-7 4 -9 11.5t2 14.5l32 56q-71 33 -131.5 87t-106.5 127 q-12 18 -12 39.5zM75 375q40 -64 93.5 -112t117.5 -77l28 51q-42 31 -67.5 78t-25.5 104q0 38 12.5 72.5t33.5 63.5q-57 -30 -106 -75t-86 -105zM300 419q0 -11 8 -19.5t20 -8.5t20 8.5t8 19.5q0 38 26 64t64 26q12 0 20 8.5t8 19.5q0 12 -8 20t-20 8q-30 0 -57 -11.5 t-46.5 -31t-31 -46.5t-11.5 -57zM453 75l43 78q102 12 186.5 70.5t142.5 151.5q-53 83 -128 138l37 67q45 -32 84 -73t71 -92q11 -19 11 -40.5t-11 -39.5q-78 -124 -191.5 -191.5t-244.5 -68.5zM528 210l139 249q2 -10 3 -19.5t1 -20.5q0 -36 -10.5 -68.5t-29.5 -59.5 t-45.5 -48t-57.5 -33z" /> +<glyph unicode="" horiz-adv-x="850" d="M5 23.5q-14 23.5 6 56.5l368 637q18 33 46 33q26 0 46 -33l368 -637q19 -33 5.5 -56.5t-51.5 -23.5h-736q-38 0 -52 23.5zM160 113h530l-265 459zM370 434q0 6 4 10t9 4h84q5 0 9 -4t4 -10l-7 -182q0 -12 -13 -12h-70q-13 0 -13 12zM372 189q0 13 13 13h78q13 0 13 -13 l1 -49q0 -13 -13 -13h-78q-13 0 -13 13z" /> +<glyph unicode="" d="M1 212l34 144q2 8 2 18t-2 18l-34 144q-2 8 2 13.5t12 5.5h45q8 0 17 -4.5t14 -10.5l85 -110q44 9 92 14t94 5h12l-61 283q-2 8 2.5 13t12.5 5h64q8 0 16 -4.5t12 -11.5l164 -285h157q29 0 58 -6.5t51.5 -17t36.5 -24t13 -27.5q1 -14 -13 -27.5t-36.5 -24t-51.5 -17 t-58 -6.5h-158l-163 -283q-4 -7 -12 -11.5t-16 -4.5h-64q-8 0 -12.5 5t-2.5 13l61 281h-12q-46 0 -94 5.5t-92 13.5l-85 -110q-12 -14 -31 -14h-45q-8 0 -12 5t-2 13z" /> +<glyph unicode="" horiz-adv-x="750" d="M0 56v549q0 23 16.5 39.5t39.5 16.5h36v-69q0 -28 19.5 -47.5t47.5 -19.5h15q28 0 48 19.5t20 47.5v69h58v-69q0 -28 19.5 -47.5t47.5 -19.5h16q28 0 47.5 19.5t19.5 47.5v69h58v-69q0 -28 20 -47.5t48 -19.5h15q28 0 47.5 19.5t19.5 47.5v69h36q23 0 39.5 -16.5 t16.5 -39.5v-549q0 -23 -16.5 -39.5t-39.5 -16.5h-638q-23 0 -39.5 16.5t-16.5 39.5zM75 75h600v398h-600v-398zM129 592v128q0 12 9 21t21 9h15q13 0 21.5 -9t8.5 -21v-128q0 -12 -8.5 -20.5t-21.5 -8.5h-15q-12 0 -21 8.5t-9 20.5zM177 158q0 36 20 58.5t43.5 39t43.5 32 t20 36.5q0 20 -11.5 29t-28.5 9q-11 0 -20.5 -4.5t-16.5 -11.5q-4 -4 -7 -8t-6 -9l-34 23q7 14 20 27q11 11 27.5 19t40.5 8q35 0 61 -20.5t26 -58.5q0 -21 -9 -36.5t-23 -28t-30 -22.5t-30 -20t-23.5 -21t-9.5 -25h92v34h42v-73h-185q-1 6 -1.5 12t-0.5 11zM338 592v128 q0 12 8.5 21t20.5 9h16q12 0 21 -9t9 -21v-128q0 -12 -9 -20.5t-21 -8.5h-16q-12 0 -20.5 8.5t-8.5 20.5zM397 330v71h187v-34l-117 -232h-51l107 212q3 8 6 11l3 4v1q-3 0 -5 -1h-13h-75v-32h-42zM546 592v128q0 12 8.5 21t21.5 9h15q12 0 21 -9t9 -21v-128q0 -12 -9 -20.5 t-21 -8.5h-15q-13 0 -21.5 8.5t-8.5 20.5z" /> +<glyph unicode="" d="M0 122v75q0 19 19 19h107q25 0 48.5 15.5t45.5 41t44 58.5t44 68q27 43 56 85.5t62 75.5t72 53.5t88 20.5h99v90q0 20 12 24t29 -10l163 -135q11 -9 11 -23q0 -13 -11 -22l-163 -136q-17 -14 -29 -10t-12 24v86h-99q-26 0 -49 -15.5t-45.5 -41t-44.5 -58.5t-44 -68 q-27 -44 -55.5 -86t-61.5 -75t-72.5 -53.5t-87.5 -20.5h-107q-8 0 -13.5 5t-5.5 13zM0 541v75q0 8 5.5 13.5t13.5 5.5h107q52 0 93.5 -23.5t76.5 -61.5q-18 -25 -34 -49.5t-31 -47.5q-25 31 -50.5 50t-54.5 19h-107q-8 0 -13.5 5.5t-5.5 13.5zM417 190q17 24 33 48.5 t31 48.5q25 -31 50.5 -50t54.5 -19h99v94q0 20 12 24t29 -10l163 -136q11 -9 11 -22q0 -14 -11 -23l-163 -135q-17 -14 -29 -10t-12 24v82h-99q-53 0 -93.5 23t-75.5 61z" /> +<glyph unicode="" d="M0 421q0 68 35.5 128t96.5 104.5t143 70.5t175 26t175 -26t143 -70.5t96.5 -104.5t35.5 -128t-35.5 -128t-96.5 -104.5t-143 -70.5t-175 -26q-44 0 -84 6q-42 -32 -90.5 -55t-103.5 -35l-24 -4q-12 -2 -25 -4q-16 -2 -20 14v1q-2 7 3 11l9 10q10 11 19.5 21.5t17 24.5 t14 32.5t11.5 45.5q-81 45 -129 112.5t-48 148.5z" /> +<glyph unicode="" horiz-adv-x="750" d="M0 311v139q0 8 5.5 13.5t13.5 5.5h187q8 0 13.5 -5.5t5.5 -13.5v-139q0 -13 11 -28t30.5 -28t47 -21.5t61.5 -8.5t61.5 8.5t47 21.5t30.5 28t11 28v139q0 8 5.5 13.5t13.5 5.5h187q8 0 13.5 -5.5t5.5 -13.5v-139q0 -65 -29.5 -121.5t-80.5 -98.5t-119 -66.5t-146 -24.5 t-146 24.5t-119 66.5t-80.5 98.5t-29.5 121.5zM0 544v187q0 19 19 19h187q19 0 19 -19v-187q0 -19 -19 -19h-187q-19 0 -19 19zM525 544v187q0 19 19 19h187q19 0 19 -19v-187q0 -19 -19 -19h-187q-19 0 -19 19z" /> +<glyph unicode="" horiz-adv-x="750" d="M-0.5 173.5q-0.5 18.5 13.5 32.5l329 329q14 14 33 14t33 -14l328 -329q14 -14 14 -32.5t-14 -32.5l-49 -50q-14 -14 -33 -14t-33 14l-248 249l-244 -249q-14 -14 -33 -14t-33 14l-49 50q-14 14 -14.5 32.5z" /> +<glyph unicode="" horiz-adv-x="750" d="M0 448.5q0 18.5 14 32.5l49 50q14 14 33 14t33 -14l248 -249l244 249q14 14 33 14t33 -14l49 -50q14 -14 14.5 -32.5t-13.5 -32.5l-329 -329q-14 -14 -33 -14t-33 14l-328 329q-14 14 -14 32.5z" /> +<glyph unicode="" d="M1 502.5q-6 14.5 13 34.5l181 199q12 14 30 14t30 -14l181 -199q19 -20 13 -34.5t-32 -14.5h-117v-319h81q4 -5 6.5 -9.5t7.5 -9.5l119 -131h-327q-15 0 -26 11t-11 26v432h-117q-26 0 -32 14.5zM386 731h326q16 0 27 -11t11 -26v-431h117q26 0 32 -15t-13 -35l-181 -199 q-12 -14 -30 -14t-30 14l-181 199q-19 20 -13 35t32 15h117v318h-81q-4 5 -6.5 9.5t-7.5 9.5z" /> +<glyph unicode="" d="M0 694v37q0 19 19 19h113q8 0 18.5 -2t17.5 -4q3 -2 7 -7t7.5 -11.5t6 -13t3.5 -10.5l13 -61h658q17 0 28 -13t8 -29l-53 -282q-3 -12 -13 -20.5t-24 -8.5h-529l17 -82q2 -8 8.5 -13t14.5 -5h418q8 0 13.5 -5.5t5.5 -13.5v-38q0 -8 -5.5 -13t-13.5 -5h-80h-318h-51 q-8 0 -18 1.5t-17 4.5q-3 1 -7 6.5t-7.5 12t-6 13t-3.5 10.5l-105 496q-2 8 -8.5 13t-14.5 5h-83q-19 0 -19 19zM284 56q0 23 16.5 40t39.5 17q24 0 40.5 -17t16.5 -40t-16.5 -39.5t-40.5 -16.5q-23 0 -39.5 16.5t-16.5 39.5zM602 56q0 23 16.5 40t39.5 17t39.5 -17 t16.5 -40t-16.5 -39.5t-39.5 -16.5t-39.5 16.5t-16.5 39.5z" /> +<glyph unicode="" d="M0 56v638q0 23 16.5 39.5t39.5 16.5h338q23 0 39.5 -16.5t16.5 -39.5t16.5 -39.5t39.5 -16.5h338q23 0 39.5 -17t16.5 -40v-525q0 -23 -16.5 -39.5t-39.5 -16.5h-788q-23 0 -39.5 16.5t-16.5 39.5z" /> +<glyph unicode="" d="M0 185v509q0 23 16.5 39.5t39.5 16.5h338q23 0 39.5 -16.5t16.5 -39.5t16.5 -39.5t39.5 -16.5h216q23 0 39.5 -17t16.5 -40v-108h-600q-18 0 -35 -6t-32 -16.5t-26 -25t-17 -31.5zM21 0l120 371q3 11 15 19t23 8h721l-127 -370q-3 -11 -15 -19.5t-23 -8.5h-714z" /> +<glyph unicode="" horiz-adv-x="375" d="M0.5 187q4.5 11 27.5 11h95v354h-95q-23 0 -27.5 10.5t11.5 26.5l150 151q10 10 26 10q15 0 25 -10l150 -151q16 -15 11.5 -26t-27.5 -11h-95v-354h95q23 0 27.5 -10.5t-11.5 -26.5l-150 -151q-10 -10 -26 -10q-15 0 -25 10l-150 151q-16 15 -11.5 26z" /> +<glyph unicode="" horiz-adv-x="750" d="M0 357q0 15 10 25l151 151q15 15 26 10.5t11 -26.5v-96h354v96q0 22 10.5 26.5t26.5 -11.5l151 -150q10 -10 10 -25t-10 -25l-151 -151q-15 -16 -26 -11t-11 27v96h-354v-96q0 -22 -10.5 -26.5t-26.5 11.5l-151 150q-10 10 -10 25z" /> +<glyph unicode="" d="M0 56v638q0 23 17 39.5t40 16.5h787q23 0 39.5 -16.5t16.5 -39.5v-638q0 -23 -16.5 -39.5t-39.5 -16.5h-787q-23 0 -40 16.5t-17 39.5zM75 75h750v600h-750v-600zM150 129v177h99v-177h-99zM317 129v379h98v-379h-98zM485 129v289h99v-289h-99zM651 129v450h99v-450h-99z " /> +<glyph unicode="" horiz-adv-x="750" d="M0 94v562q0 19 7.5 36.5t20 30t29.5 20t36 7.5h563q39 0 66.5 -27.5t27.5 -66.5v-562q0 -20 -7.5 -37t-20 -29.5t-30 -20t-36.5 -7.5h-563q-19 0 -36 7.5t-29.5 20t-20 29.5t-7.5 37zM98 273q39 -54 97 -82.5t127 -28.5q47 0 90 13t78 36t60.5 55t37.5 70q40 3 63 28 q7 7 2 16q-4 9 -15 7h-2q11 11 15 22q4 10 -4 16q-7 7 -16 1q-4 -2 -14.5 -5t-22.5 -3q-2 0 -3.5 0.5t-3.5 0.5q0 1 -0.5 2t-0.5 2q-8 30 -28 54t-46 35q2 2 3 4t3 4q3 8 0 16q-1 3 -6 8t-17 4q-1 2 -3 4q-6 6 -12 4q-12 -2 -24 -6l-1 1q-7 4 -15 -1q-29 -18 -48 -49 t-33 -66q-17 15 -28 20q-30 17 -63 31t-75 30q-7 2 -12 -2q-5 -3 -7 -10q-1 -13 4 -28.5t19 -30.5q-12 -3 -10 -16q6 -33 33 -49l-6 -6q-7 -7 -2 -16q2 -6 13 -18.5t32 -18.5q-3 -6 -3 -11t1 -7q3 -16 19 -24q-18 -12 -38.5 -16.5t-41.5 -3t-40.5 10t-34.5 22.5q-4 4 -9.5 4 t-9.5 -4q-11 -9 -2 -19z" /> +<glyph unicode="" horiz-adv-x="750" d="M1 94v562q0 19 7.5 36.5t20 30t29.5 20t36 7.5h563q39 0 66.5 -27.5t27.5 -66.5v-562q0 -20 -7.5 -37t-20 -29.5t-30 -20t-36.5 -7.5h-237v314h84q6 0 10.5 4t4.5 10l6 82q0 7 -4 12q-5 5 -11 5h-90v36q0 20 5 26.5t26 6.5q12 0 27 -2t29 -5q3 0 6.5 0.5t5.5 2.5 q5 3 7 11l11 79q2 14 -12 17q-44 12 -92 12q-147 0 -147 -143v-41h-50q-16 0 -16 -16v-82q0 -6 4.5 -10.5t11.5 -4.5h50v-314h-192q-19 0 -36 7.5t-29.5 20t-20 29.5t-7.5 37z" /> +<glyph unicode="" d="M0 56v638q0 23 16.5 39.5t39.5 16.5h788q23 0 39.5 -16.5t16.5 -39.5v-638q0 -23 -16.5 -39.5t-39.5 -16.5h-788q-23 0 -39.5 16.5t-16.5 39.5zM75 78h750v56h-750v-56zM75 559h750v113h-467l-7 -45h-276v-68zM130 655h154v45h-154v-45zM272 346q0 -37 14 -69.5t38 -56.5 t56.5 -38t69.5 -14t69.5 14t56.5 38t38 56.5t14 69.5t-14 69.5t-38 56.5t-56.5 38t-69.5 14t-69.5 -14t-56.5 -38t-38 -56.5t-14 -69.5zM328 346q0 25 9.5 47.5t26 39t39 26t47.5 9.5t47.5 -9.5t39 -26t26 -39t9.5 -47.5t-9.5 -47.5t-26 -39t-39 -26t-47.5 -9.5t-47.5 9.5 t-39 26t-26 39t-9.5 47.5zM363 346q0 -8 6 -14t14 -6q9 0 15 6t6 14q0 20 13.5 33t32.5 13v1q9 0 15 6t6 14q0 9 -6 15t-15 6q-36 0 -61.5 -26t-25.5 -62z" /> +<glyph unicode="" d="M0.5 391.5q-2.5 52.5 14 108.5t53.5 107q36 51 83.5 85t98 48t99.5 8t90 -35q36 -26 57 -63.5t27.5 -82.5t-1.5 -93.5t-32 -95.5l195 -139l47 65l-49 35q-7 5 -8.5 13t3.5 15l23 32q5 7 13 8.5t15 -3.5l163 -116q7 -5 8 -13t-4 -15l-23 -33q-5 -7 -13 -8.5t-15 3.5 l-48 35l-47 -65l116 -83q20 -14 24.5 -39t-10.5 -45q-14 -20 -38.5 -24t-44.5 10l-376 269q-37 -38 -80.5 -61.5t-88 -31.5t-87 -0.5t-78.5 33.5q-41 29 -62.5 74t-24 97.5zM109 374.5q3 -19.5 13.5 -37t27.5 -29.5t37 -16.5t39.5 -1t37 14t29.5 27.5q17 24 18 53t-12 54 q28 -5 55 5.5t45 35.5q12 17 16.5 37t1 39.5t-14 37t-27.5 29.5t-37 16.5t-39.5 1t-37 -14t-29.5 -27.5q-17 -25 -18.5 -54t12.5 -54q-28 5 -55 -5.5t-45 -35.5q-12 -17 -16 -36.5t-1 -39z" /> +<glyph unicode="" d="M0 391v84q0 6 5 6q14 4 29.5 6t30.5 4q4 0 7 0.5t7 0.5q6 21 17 42q-9 14 -20 28t-23 28q-5 5 0 9q14 17 30 33.5t33 30.5q6 4 9 -1q8 -8 17 -14.5t18 -13.5l21 -15q21 11 42 17q2 21 4.5 39t6.5 35q0 5 6 5h84q7 0 7 -6q2 -14 4.5 -28.5t4.5 -29.5l2 -15q20 -6 41 -17 q8 7 19 14q10 8 19.5 15t18.5 15q6 4 9 -1q5 -4 9 -8l8 -8l22 -22q12 -12 23 -25q3 -5 0 -9q-10 -11 -20 -24.5t-23 -30.5q6 -11 10.5 -22t8.5 -22q8 -2 17.5 -3t19.5 -3l18 -2q9 -1 17 -3q6 -2 6 -7v-84q0 -5 -5 -7q-14 -3 -29.5 -5t-30.5 -4q-4 0 -14 -2q-6 -20 -17 -41 q9 -14 20 -28t23 -28q4 -5 0 -9q-14 -17 -30 -33.5t-33 -30.5q-6 -4 -9 1q-8 7 -17 14t-18 13q-5 5 -10.5 8.5t-10.5 7.5q-21 -11 -42 -17q-2 -17 -4 -36.5t-7 -37.5q-2 -5 -7 -5h-84q-6 0 -6 5q-3 14 -5 29l-4 30l-2 15q-20 6 -41 17q-5 -4 -9.5 -7t-9.5 -7 q-10 -8 -19.5 -15t-18.5 -15q-6 -4 -9 1q-5 4 -8 8l-9 8q-11 11 -22.5 22t-22.5 25q-4 4 0 8q12 14 22.5 28.5t19.5 27.5q-10 20 -18 44q-8 2 -17.5 3t-19.5 3l-18 2q-9 1 -18 3q-5 2 -5 7zM197 432q0 -35 25 -60t60 -25t60 25t25 60t-25 60t-60 25t-60 -25t-25 -60z M524 188q-2 6 4 8q11 4 21 8t21 8q1 5 1.5 9t2.5 9t3.5 8.5t3.5 8.5q-7 10 -13 19.5t-12 19.5q-3 5 2 8l62 56q4 4 9 1q9 -7 17.5 -14t17.5 -15q18 7 35 8q5 11 10.5 21t10.5 19q3 5 8 3l80 -25q5 -2 5 -8q-2 -11 -4 -21.5t-4 -21.5q8 -6 14 -13t11 -15q12 1 23 1.5t22 0.5 q5 0 7 -5l18 -83q2 -5 -4 -7q-11 -5 -21 -8.5t-21 -7.5q-1 -5 -1.5 -9t-2.5 -9t-3.5 -8.5t-3.5 -7.5q7 -10 13.5 -19.5t11.5 -19.5q2 -5 -2 -8l-62 -57q-4 -4 -9 0q-8 7 -17 14t-17 14q-20 -7 -37 -8q-5 -11 -10 -21t-10 -19q-3 -5 -8 -3l-80 25q-5 2 -5 8q2 11 3.5 22 t3.5 22q-14 12 -24 27q-12 -2 -23.5 -2.5t-22.5 0.5q-5 0 -7 5zM560 607q0 5 5 7q10 2 20 4.5t20 4.5q2 4 3 8t3 8t4.5 7t4.5 7q-5 10 -9 19.5t-8 18.5q-2 4 2 8l64 42q5 3 8 -1q8 -7 14.5 -14.5t13.5 -15.5q16 3 33 3q12 18 24 33q3 3 8 2l69 -34q5 -3 3 -8 q-2 -10 -5.5 -19t-6.5 -19q10 -13 18 -29q11 -1 21.5 -1.5t20.5 -2.5q5 -2 5 -6l5 -77q0 -4 -5 -6q-10 -2 -19.5 -4.5t-20.5 -4.5q-2 -4 -3 -7.5t-3 -7.5q-3 -7 -8 -14q5 -10 9 -19.5t8 -18.5q2 -5 -3 -8l-63 -42q-5 -3 -8 1q-13 12 -28 30q-8 -2 -16.5 -3t-17.5 0 q-6 -9 -12 -17.5t-12 -16.5q-3 -3 -8 -1l-69 34q-5 2 -3 7q3 10 6 19.5t7 19.5q-6 6 -10.5 13t-8.5 15q-11 1 -21.5 1.5t-20.5 2.5q-5 0 -5 6zM658 203q-7 -22 3.5 -42.5t33.5 -27.5q22 -8 42.5 2.5t27.5 33.5q8 22 -2.5 42.5t-33.5 28.5q-22 7 -42.5 -3.5t-28.5 -33.5z M681 564q7 -20 26 -30q20 -9 40 -2.5t29 25.5q10 20 3 40t-26 29q-19 10 -39 3t-30 -26t-3 -39z" /> +<glyph unicode="" d="M0 483q0 55 29 103.5t78.5 85t116 57.5t142.5 21t142.5 -21t116 -57.5t78 -85t28.5 -103.5q0 -56 -28.5 -104.5t-78 -84.5t-116 -57t-142.5 -21q-18 0 -35 1.5t-34 3.5q-34 -26 -73 -45t-84 -29q-20 -5 -40 -6q-12 -2 -16 11v1q-2 5 1.5 9t7.5 8q17 17 30 37t21 64 q-66 36 -105 91t-39 121zM305 136q8 4 12 7q13 -2 25 -2h24q93 0 173 26.5t139.5 72.5t93.5 108.5t34 134.5q0 19 -3 39q45 -36 71 -81.5t26 -98.5q0 -66 -39 -120.5t-105 -91.5q8 -44 21 -63.5t30 -36.5q4 -5 7.5 -9t1.5 -9q-1 -6 -6 -9.5t-10 -2.5q-11 2 -20.5 3.5 t-19.5 3.5q-88 19 -157 73q-17 -2 -34 -3.5t-35 -1.5q-66 0 -123.5 16t-105.5 45z" /> +<glyph unicode="" horiz-adv-x="783" d="M0.5 222q-1.5 56 2 112t12.5 105q45 3 94 3t90 -10q6 -38 10 -91t5.5 -110t0.5 -111t-5 -94q-18 -2 -41.5 -2.5t-49 0.5t-50 1.5t-44.5 0.5q-10 38 -16.5 89t-8 107zM91 101q0 -16 11 -27t27 -11t26.5 11t10.5 27q0 15 -10.5 26t-26.5 11t-27 -11t-11 -26zM240 412 q22 10 35.5 19.5t24.5 21t22.5 26t30.5 34.5q16 16 28.5 26.5t23 20t19 20t17.5 25.5q16 29 21 65t13 68q0 7 7 11q19 3 35 -3.5t28 -17.5t19.5 -26t10.5 -28q6 -33 -1.5 -59.5t-19 -50.5t-22 -46.5t-11.5 -47.5q21 -9 51.5 -9.5t63.5 1t64 1.5t52 -8.5t28.5 -29t-5.5 -59.5 q0 -2 -2.5 -5.5t-5 -8t-4.5 -8.5l-2 -3q11 -11 16 -23t5 -20q1 -39 -32 -68q10 -15 11 -31.5t-4 -31.5t-14.5 -26.5t-21.5 -17.5q6 -34 -6 -58t-35.5 -38.5t-56.5 -20.5t-69 -6t-72.5 5t-67.5 14q-20 6 -39 14t-38.5 15t-41 11t-45.5 0q2 39 2.5 85t-1 93.5t-4.5 92.5t-7 82 z" /> +<glyph unicode="" horiz-adv-x="783" d="M1 452q-1 21 7.5 37.5t24.5 30.5q-9 15 -10 31.5t3.5 31.5t14 26.5t21.5 17.5q-6 34 6 58t35.5 38.5t56.5 20.5t69 6t72.5 -5t67.5 -14q20 -6 39 -14t38.5 -15t41 -10.5t45.5 0.5q-2 -39 -2.5 -85.5t1 -94t4 -92.5t7.5 -82q-22 -10 -35.5 -19.5t-24 -21t-22.5 -26 t-31 -33.5q-15 -17 -27.5 -27.5t-23 -20t-19.5 -19.5t-18 -26q-16 -29 -20.5 -65t-13.5 -68q0 -8 -7 -11q-20 -3 -35.5 3.5t-27.5 17.5t-19.5 25.5t-10.5 28.5q-6 33 1.5 59.5t19 50.5t22 47t11.5 48q-21 9 -51.5 9t-63.5 -1.5t-63.5 -1.5t-52 8.5t-29 29t5.5 59.5 q1 1 3.5 5.5t5 8.5t3.5 8l2 3q-11 11 -16 23t-5 20zM568 630q1 54 5 94q18 2 42 2.5t49.5 0t50 -1.5t44.5 -1q10 -38 16 -89t7.5 -106.5t-2 -112t-12.5 -105.5q-45 -3 -93.5 -3t-90.5 10q-6 38 -10 91t-5.5 110t-0.5 111zM617 650q0 -16 11 -27t27 -11q15 0 26 11t11 27 q0 15 -11 26t-26 11q-16 0 -27 -11t-11 -26z" /> +<glyph unicode="" horiz-adv-x="393" d="M0.5 465q4.5 13 25.5 16l238 34l106 216q9 19 23 19v-633l-212 -112q-20 -10 -31 -2t-7 30l41 236l-172 168q-16 15 -11.5 28z" /> +<glyph unicode="" horiz-adv-x="846" d="M0 519q0 64 20.5 108t53 71.5t73.5 39.5t82 12q30 0 59 -10t54 -25t45.5 -32.5t35.5 -32.5q15 15 36 32.5t46 32.5t53.5 25t58.5 10q42 0 83 -12t73.5 -39.5t52.5 -71.5t20 -108q0 -44 -16.5 -83.5t-36 -69.5t-37 -48t-18.5 -19l-288 -288q-13 -11 -27 -11q-15 0 -26 11 l-290 288q-1 1 -18 19t-36.5 48t-36 69.5t-16.5 83.5zM75 519q0 -32 13 -61.5t29 -53t29 -37.5l14 -14l263 -263l263 262q1 1 14 15t29 37.5t29 53t13 61.5q0 48 -14 78.5t-36.5 48t-50 23.5t-53.5 6q-25 0 -50.5 -12t-48 -29t-40 -34.5t-26.5 -28.5q-11 -14 -29 -14t-29 14 q-9 11 -26.5 28.5t-40 34.5t-48 29t-50.5 12q-26 0 -53.5 -6t-50 -23.5t-36.5 -48t-14 -78.5z" /> +<glyph unicode="" horiz-adv-x="825" d="M0 150v450q0 31 12 58t32.5 47.5t47.5 32.5t58 12h225v-94h-225q-23 0 -39.5 -16.5t-16.5 -39.5v-450q0 -23 16.5 -39.5t39.5 -16.5h225v-94h-225q-31 0 -58 12t-47.5 32.5t-32.5 47.5t-12 58zM248 285v180q0 16 11 26.5t27 10.5h209v143q0 20 19 28q19 7 32 -7l270 -270 q9 -9 9 -21.5t-9 -20.5l-270 -270q-9 -9 -21 -9q-5 0 -11 2q-19 8 -19 28v142h-209q-16 0 -27 11t-11 27z" /> +<glyph unicode="" horiz-adv-x="750" d="M0 94v562q0 19 7.5 36.5t20 30t29.5 20t37 7.5h562q39 0 66.5 -27.5t27.5 -66.5v-562q0 -20 -7.5 -37t-20 -29.5t-30 -20t-36.5 -7.5h-562q-39 0 -66.5 27.5t-27.5 66.5zM101 582q0 -28 19.5 -47.5t46.5 -19.5q28 0 47.5 19.5t19.5 47.5q0 27 -19.5 46.5t-47.5 19.5 q-27 0 -46.5 -19.5t-19.5 -46.5zM104 117q0 -5 4.5 -9.5t9.5 -4.5h98q6 0 10 4.5t4 9.5v345q0 14 -14 14h-98q-5 0 -9.5 -4t-4.5 -10v-345zM283 117q0 -5 4.5 -9.5t9.5 -4.5h98q6 0 10 4.5t4 9.5v187q0 28 8 47q15 31 55 31q32 0 42 -19q7 -11 7 -35v-211q0 -5 4 -9.5 t10 -4.5h100q6 0 10 4.5t4 9.5v233q0 72 -42 104q-40 31 -103 31q-50 0 -85 -23q-4 -3 -13 -12v12q0 14 -14 14h-95q-5 0 -9.5 -4t-4.5 -10v-345z" /> +<glyph unicode="" d="M1 461q4 38 21 80.5t47 82.5t65.5 68.5t71.5 43t68.5 14t56.5 -18.5q25 -18 34.5 -49.5t5.5 -70.5l141 -105q52 29 101.5 33.5t84.5 -21.5q25 -19 37.5 -50.5t11.5 -70.5t-14.5 -83.5t-39.5 -88.5l201 -193q5 -5 6 -12t-4 -12q-5 -8 -15 -8q-3 0 -9 2l-242 138 q-35 -37 -73.5 -63t-75.5 -38t-71 -9.5t-60 22.5q-35 26 -45 74.5t4 106.5l-141 106q-36 -15 -69 -15t-58 18q-24 18 -34 49.5t-6 69.5zM80 417.5q1 -7.5 8 -12.5q8 -7 22 -7q15 0 31.5 8t33.5 22t33.5 31.5t31.5 37.5q5 6 4 13.5t-8 12.5q-6 5 -13.5 4t-12.5 -8 q-37 -49 -65.5 -67.5t-34.5 -16.5q-6 5 -13.5 4t-12.5 -8q-5 -6 -4 -13.5zM219 368l170 -127q6 -4 11 -4q10 0 15 8q5 6 4 13.5t-7 12.5l-163 121q-15 -14 -30 -24zM393 141q-10 -16 4 -27q13 -10 33 -10q19 0 41 10t44.5 27t44.5 39t41 47q5 7 4 14.5t-8 12.5 q-6 5 -13.5 3.5t-12.5 -7.5q-24 -32 -48 -54.5t-45 -35.5t-36.5 -17t-22.5 2q-6 5 -13.5 3.5t-12.5 -7.5z" /> +<glyph unicode="" d="M0 150v450q0 31 12 58.5t32 47.5t47.5 32t58.5 12h284q-1 -7 -2 -13.5t-1 -14.5v-43q0 -11 3 -23h-284q-23 0 -39.5 -16.5t-16.5 -39.5v-450q0 -23 16.5 -39.5t39.5 -16.5h525q23 0 39.5 16.5t16.5 39.5v166q20 -15 44 -24t50 -10v-132q0 -31 -12 -58t-32.5 -47.5 t-47.5 -32.5t-58 -12h-525q-31 0 -58.5 12t-47.5 32.5t-32 47.5t-12 58zM338 255q0 12 8 20l376 377h-131q-12 0 -20 8t-8 20v42q-1 11 7.5 19.5t20.5 8.5h281q11 0 19.5 -8.5t8.5 -19.5v-42v-239q0 -12 -8.5 -20.5t-19.5 -7.5h-42q-12 0 -20 8t-8 20v131l-377 -376 q-8 -8 -20 -8t-20 8l-39 39q-8 8 -8 20z" /> +<glyph unicode="" horiz-adv-x="825" d="M0 285v180q0 16 11 26.5t27 10.5h209v143q0 20 18 28q19 7 33 -7l270 -270q8 -9 8 -21.5t-8 -20.5l-270 -270q-9 -9 -21 -9q-4 0 -12 2q-18 8 -18 28v142h-209q-16 0 -27 11t-11 27zM450 0v94h225q23 0 39.5 16.5t16.5 39.5v450q0 23 -16.5 39.5t-39.5 16.5h-225v94h225 q31 0 58 -12t47.5 -32t32.5 -47.5t12 -58.5v-450q0 -31 -12 -58t-32.5 -47.5t-47.5 -32.5t-58 -12h-225z" /> +<glyph unicode="" horiz-adv-x="825" d="M0 509v91q0 16 11 26.5t27 10.5h158q-1 6 -1 13v11v2q0 26 2 43t7.5 26.5t15.5 13.5t27 4h331q16 0 26.5 -4t16 -13.5t7.5 -26.5t2 -43v-13q0 -6 -1 -13h158q16 0 27 -10.5t11 -26.5v-91q0 -31 -22 -64t-59.5 -62.5t-88 -52t-108.5 -31.5q-25 -5 -44.5 -20.5t-19.5 -34.5 q0 -17 8.5 -25t19 -15t19.5 -15.5t11 -25.5q2 -11 -1 -23q-2 -7 11.5 -11.5t33 -9t40 -11t31.5 -16.5q6 -5 9.5 -19.5t4.5 -31.5q1 -16 -3 -28.5t-14 -12.5h-481q-10 0 -14 12.5t-3 28.5q1 17 4.5 31.5t9.5 19.5q11 10 31 16.5t39.5 11t33.5 9t12 11.5t-2 12v11 q1 17 10.5 25.5t20.5 15.5t19.5 15t8.5 25q0 19 -19.5 34.5t-45.5 20.5q-57 10 -107.5 32.5t-88 51.5t-59.5 62t-22 64zM75 509q0 -10 11.5 -26.5t33 -34.5t52 -35t68.5 -29q-12 39 -21.5 85.5t-16.5 92.5h-127v-53zM585 384q38 12 68.5 29t52 35t33 34.5t11.5 26.5v53h-128 q-6 -46 -15.5 -92.5t-21.5 -85.5z" /> +<glyph unicode="" horiz-adv-x="750" d="M0 94v562q0 19 7.5 36.5t20 30t29.5 20t37 7.5h562q39 0 66.5 -27.5t27.5 -66.5v-562q0 -20 -7.5 -37t-20 -29.5t-30 -20t-36.5 -7.5h-562q-39 0 -66.5 27.5t-27.5 66.5zM94 321q0 -44 11 -82.5t41.5 -67t85.5 -45t143 -16.5t142.5 16.5t85.5 45t42 67t11 82.5 q0 73 -46 127q4 16 5 36t-1.5 39t-7.5 36t-12 29h-14q-42 -2 -74 -22t-63 -37l-7 1q-8 0 -18.5 1t-22 1.5t-20.5 0.5q-18 0 -35 -1t-33 -3q-31 17 -63 37t-74 22h-14q-8 -12 -12.5 -29t-7 -36t-1.5 -39t5 -36q-46 -54 -46 -127zM183 289q15 60 84 67q13 2 27 1.5t30 -1.5 q7 0 25.5 -1t25.5 -1t25.5 1t25.5 1q16 1 30 1.5t26 -1.5q70 -7 85 -67q8 -33 -3 -61.5t-24 -41.5q-20 -20 -66 -32t-99 -12t-99 12t-66 32q-13 13 -24 41.5t-3 61.5zM242 265q0 -23 11 -39t27 -16t27 16t11 39t-11 38.5t-27 15.5t-27 -15.5t-11 -38.5zM432 265 q0 -23 11 -39t27 -16t27 16t11 39t-11 38.5t-27 15.5t-27 -15.5t-11 -38.5z" /> +<glyph unicode="" d="M0 19v300q0 8 5.5 13.5t13.5 5.5h112q8 0 13.5 -5.5t5.5 -13.5v-169h600v169q0 8 5.5 13.5t13.5 5.5h112q8 0 13.5 -5.5t5.5 -13.5v-300q0 -19 -19 -19h-862q-19 0 -19 19zM169 473.5q-3 7.5 8 18.5l246 247q11 11 27 11t27 -11l247 -247q11 -11 7.5 -18.5t-18.5 -7.5 h-150v-244q0 -16 -11 -27t-27 -11h-150q-16 0 -26.5 11t-10.5 27v244h-150q-16 0 -19 7.5z" /> +<glyph unicode="" horiz-adv-x="786" d="M1 251q-1 17 0.5 33.5t3.5 36.5q2 17 3.5 35t4.5 32q7 32 15 62.5t22 57.5q10 20 22 39.5t26 38.5q5 7 10.5 12t11.5 10l22 22q11 11 24 21t28 18t32 16q16 8 33 14.5t35 13.5q34 14 76 25l1 1q22 6 41.5 8.5t38.5 2.5q29 0 55 -4.5t52 -9.5q20 -4 41.5 -7.5t45.5 -3.5h1 q14 0 30.5 2.5t32.5 2.5q12 0 22 -3t16 -12q11 -15 12.5 -35t-0.5 -37t-4 -34.5t1 -35.5q2 -11 5.5 -19t7.5 -18q4 -9 5.5 -19.5t3.5 -20.5q9 -51 7.5 -95.5t-11.5 -83t-27.5 -72.5t-39.5 -65q-18 -24 -38.5 -47.5t-45 -44.5t-54 -38t-65.5 -29q-37 -13 -77.5 -16.5 t-77.5 -5.5h-15q-51 0 -95 8t-94 8h-2q-17 0 -37.5 -5t-40.5 -6h-1q-18 0 -32 8.5t-21 20.5q-10 17 -8.5 35.5t6.5 33.5t5 32.5t-2.5 37t-6 39.5t-4.5 40z" /> +<glyph unicode="" horiz-adv-x="1000" /> +</font> +</defs></svg> \ No newline at end of file diff -r 484c3bfb7f3e24213447ea45ed273c328e599eb8 -r 551adce80d002272ce47a850834c26b8b63028a7 static/images/fonts/fontawesome-webfont.svgz Binary file static/images/fonts/fontawesome-webfont.svgz has changed diff -r 484c3bfb7f3e24213447ea45ed273c328e599eb8 -r 551adce80d002272ce47a850834c26b8b63028a7 static/images/fonts/fontawesome-webfont.ttf Binary file static/images/fonts/fontawesome-webfont.ttf has changed diff -r 484c3bfb7f3e24213447ea45ed273c328e599eb8 -r 551adce80d002272ce47a850834c26b8b63028a7 static/images/fonts/fontawesome-webfont.woff Binary file static/images/fonts/fontawesome-webfont.woff has changed diff -r 484c3bfb7f3e24213447ea45ed273c328e599eb8 -r 551adce80d002272ce47a850834c26b8b63028a7 static/june_2007_style/base.less --- a/static/june_2007_style/base.less +++ b/static/june_2007_style/base.less @@ -2,7 +2,7 @@ @import "galaxy_bootstrap.less"; -@import "iconic_stroke.less"; +@import "fontawesome/font-awesome.less"; // Mixins @@ -17,6 +17,7 @@ .parent-width { .box-sizing(border-box); width: 100%; + *width: 90%; } // ==== Real (basic) styles ==== @@ -224,12 +225,13 @@ border-right: solid @layout_border 1px; border-top: solid @layout_border 1px; #gradient > .vertical-three-colors(darken(@white, 5%), darken(@white, 5%), 25%, darken(@white, 10%)); - .iconic(); + .ficon(); + font-size: 4/3em; &:before { - content:'\2190'; + content:'\f053'; } &.hidden:before { - content:'\2192'; + content:'\f054'; } &.right { left: inherit; @@ -237,10 +239,10 @@ border-right: none; border-left: solid @layout_border 1px; &.right:before{ - content:'\2192'; + content:'\f054'; } &.right.hidden:before { - content:'\2190'; + content:'\f053'; } } } @@ -484,63 +486,6 @@ // ==== Tool form styles ==== -div.toolForm { - border: solid @form_border 1px; -} - -div.toolFormTitle { - font-weight: bold; - padding: 5px; - padding-left: 10px; - padding-right: 10px; - background: @form_title_bg_bottom; - // background-image: url(form_title_bg.png); - background-repeat: repeat-x; - background-position: top; - border-bottom: solid @form_border 1px; -} - -div.toolParamHelp { - color: #666; -} - -div.toolParamHelp a { - color: #666; -} - -div.toolFormBody { - background: @form_body_bg_bottom; - background-image: url(form_body_bg.png); - background-repeat: repeat-x; - background-position: top; - padding: 5px 0; -} - -div.toolFormBody div.toolFormTitle { - background: transparent; - border: none; - font-weight: bold; - border-bottom: solid @form_border 1px; - margin-bottom: 5px; -} - -div.toolFormDisabled div.toolFormTitle { - background: @layout_bg; - border-color: @layout_border; -} - -div.toolFormDisabled { - border-color: @layout_border; -} - -div.toolHelp { - margin-top: 10px; -} - -div.toolHelpBody { - width: 100%; -} - div.metadataForm { border:solid #aaaaaa 1px; } @@ -594,17 +539,54 @@ // Forms -div.form { - border: solid @form_border 1px; +div.toolFormBody { + background: @form_body_bg_bottom; + background-image: url(form_body_bg.png); + background-repeat: repeat-x; + background-position: top; + padding: 5px 0; } -div.form-title { +div.toolFormBody div.toolFormTitle { + background: transparent; + border: none; font-weight: bold; + border-bottom: solid @form_border 1px; + margin-bottom: 5px; +} + +div.toolFormDisabled div.toolFormTitle { + background: @layout_bg; + border-color: @layout_border; +} + +div.toolFormDisabled { + border-color: @layout_border; +} + +div.toolHelp { + margin-top: 15px; + padding: 5px; +} + +div.toolHelpBody { + width: 100%; +} + + + +div.form, div.toolForm { + // border: solid @form_border 1px; +} + +div.form-title, div.toolFormTitle { + font-size: @baseFontSize * 1.25; + line-height: @baseLineHeight * 1.5; padding: 5px 10px; background: @form_title_bg_bottom; - background-image: url(form_title_bg.png); - background-repeat: repeat-x; - background-position: top; + // background-image: url(form_title_bg.png); + // background-repeat: repeat-x; + // background-position: top; border-bottom: solid @form_border 1px; } @@ -658,8 +640,27 @@ padding: 3px 0; } -.form-row .help { +.form-row .help, .toolParamHelp { color: #666; + a { + color: #666; + } +} + +.form-row.form-actions { + background: whiteSmoke; + border-top: solid #ddd 1px; + padding-top: 10px; + padding-bottom: 10px; + margin-top: 5px; +} + +// Selects +select { + //border: 1px solid @formElementBorder; + padding: 4px; + font-size: @baseFontSize; + line-height: @baseLineHeight; } select, input, textarea { @@ -671,22 +672,28 @@ max-width: 300px; } +textarea, input[type="text"], input[type="password"] { + font-size: @baseFontSize; + line-height: @baseLineHeight; + border: 1px solid @formElementBorder; + padding: 3px; +} + .search-query { display: inline-block; padding: 4px; - margin-bottom: 9px; font-size: @baseFontSize; line-height: @baseLineHeight; color: @gray; border: 1px solid @formElementBorder; - padding-left: 14px; - padding-right: 14px; + padding-left: 14px !important; + padding-right: 14px !important; margin-bottom: 0; // remove the default margin on all inputs .border-radius(14px); max-width: auto; } .search-query:focus { - border-color: rgba(82,168,236,.8); + border-color: darken(rgba(82,168,236,.8),15%); @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); .box-shadow(@shadow); outline: 0; @@ -710,7 +717,7 @@ background-color: @error_message_bg; */ .alert(); - min-height: 32px; + min-height: 36px; padding-left: 52px; background-image: url(error_message_icon.png); background-repeat: no-repeat; @@ -932,6 +939,91 @@ background-color: #EEEEFF; } +// Pulled out of grid base +.count-box { + min-width: 1.1em; + padding: 5px; + border-width: 1px; + border-style: solid; + text-align: center; + display: inline-block; +} +.text-filter-val { + border: solid 1px #AAAAAA; + padding: 1px 2px 1px 3px; + margin-right: 5px; + -moz-border-radius: .5em; + -webkit-border-radius: .5em; + font-style: italic; +} +.page-link a, .inactive-link { + padding: 0px 7px 0px 7px; + color: #555; +} +.inactive-link, .current-filter { + font-weight: bold; + color: #000; +} +.submit-image { + background: url(../images/fugue/magnifier-left.png) no-repeat center transparent; + background-color: #eee; + width: @baseLineHeight + 8; + height: @baseLineHeight + 8; + cursor: pointer; + margin: 0; + padding: 0; + display: block; + //float: right; + border: 1px solid #aaa; + border-left: none; +} +#advanced-search td { + padding: 3px; +} +#advanced-search table { + border-collapse: separate; +} +.delete-search-icon { + background: url(../images/delete_tag_icon_gray.png) center no-repeat; + display: inline-block; + width: 10px; + cursor: pointer; + height: 18px; + vertical-align: middle; + margin-left: 2px; + +} +.search-box-input { + border: 0; + float: left; + outline: medium none; + font-style: italic; + font-size: inherit; +} +.search-box { + vertical-align: bottom; + display: inline-block; + padding: 0; + // border: 1px solid #aaa; +} +.gray-background { + background-color: #DDDDDD; +} +.loading-elt-overlay { + background-color : white; + opacity : 0.5; + width : 100%; + height : 100%; + z-index : 14000; + position : fixed; + display: none; +} + + + + + + @@ -1073,9 +1165,9 @@ // Button styles -button { - .btn(); -} +//button { +// .btn(); +//} .action-button { .btn(); diff -r 484c3bfb7f3e24213447ea45ed273c328e599eb8 -r 551adce80d002272ce47a850834c26b8b63028a7 static/june_2007_style/blue/base.css --- a/static/june_2007_style/blue/base.css +++ b/static/june_2007_style/blue/base.css @@ -15,7 +15,7 @@ input[type="search"]{-webkit-appearance:textfield;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;} input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none;} textarea{overflow:auto;vertical-align:top;} -body{margin:0;font-family:"Lucida Grande",verdana,arial,helvetica,sans-serif;font-size:12px;line-height:16px;color:#333333;background-color:#ffffff;} +body{margin:0;font-family:"Lucida Grande",verdana,arial,helvetica,sans-serif;font-size:12px;line-height:16px;color:#111111;background-color:#ffffff;} a{color:#303030;text-decoration:none;} a:hover{color:#0a0a0a;text-decoration:underline;} p{margin:0 0 8px;font-family:"Lucida Grande",verdana,arial,helvetica,sans-serif;font-size:12px;line-height:16px;}p small{font-size:10px;color:#999999;} @@ -95,8 +95,8 @@ .fade{-webkit-transition:opacity 0.15s linear;-moz-transition:opacity 0.15s linear;-ms-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;opacity:0;}.fade.in{opacity:1;} .collapse{-webkit-transition:height 0.35s ease;-moz-transition:height 0.35s ease;-ms-transition:height 0.35s ease;-o-transition:height 0.35s ease;transition:height 0.35s ease;position:relative;overflow:hidden;height:0;}.collapse.in{height:auto;} .close{float:right;font-size:20px;font-weight:bold;line-height:16px;color:#000000;text-shadow:0 1px 0 #ffffff;opacity:0.2;filter:alpha(opacity=20);}.close:hover{color:#000000;text-decoration:none;opacity:0.4;filter:alpha(opacity=40);cursor:pointer;} -.btn{display:inline-block;padding:4px 10px 4px;font-size:12px;line-height:16px;color:#333333;text-align:center;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#fafafa;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border:1px solid #999999;border-bottom-color:#888888;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;*margin-left:.3em;}.btn:first-child{*margin-left:0;} -.btn.hover,.btn:hover{color:#333333;text-decoration:none;background-color:#e6e6e6;background-position:0 -15px;-webkit-transition:background-position 0.1s linear;-moz-transition:background-position 0.1s linear;-ms-transition:background-position 0.1s linear;-o-transition:background-position 0.1s linear;transition:background-position 0.1s linear;} +.btn{display:inline-block;padding:4px 10px 4px;font-size:12px;line-height:16px;color:#111111;text-align:center;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#fafafa;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border:1px solid #999999;border-bottom-color:#888888;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;*margin-left:.3em;}.btn:first-child{*margin-left:0;} +.btn.hover,.btn:hover{color:#111111;text-decoration:none;background-color:#e6e6e6;background-position:0 -15px;-webkit-transition:background-position 0.1s linear;-moz-transition:background-position 0.1s linear;-ms-transition:background-position 0.1s linear;-o-transition:background-position 0.1s linear;transition:background-position 0.1s linear;} .btn:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;} .btn.active,.btn:active{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);background-color:#e6e6e6;background-color:#d9d9d9 \9;outline:0;} .btn.disabled,.btn[disabled]{cursor:default;background-image:none;background-color:#e6e6e6;opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} @@ -106,8 +106,8 @@ .btn-small .icon{margin-top:-1px;} .btn-primary,.btn-primary:hover,.btn-warning,.btn-warning:hover,.btn-danger,.btn-danger:hover,.btn-success,.btn-success:hover,.btn-info,.btn-info:hover{text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);color:#ffffff;} .btn-primary.active,.btn-warning.active,.btn-danger.active,.btn-success.active,.btn-info.active{color:rgba(255, 255, 255, 0.75);} -.btn-primary{background-color:#303030;background-image:-moz-linear-gradient(top, #303030, #303030);background-image:-ms-linear-gradient(top, #303030, #303030);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#303030), to(#303030));background-image:-webkit-linear-gradient(top, #303030, #303030);background-image:-o-linear-gradient(top, #303030, #303030);background-image:linear-gradient(top, #303030, #303030);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#303030', endColorstr='#303030', GradientType=0);border-color:#303030 #303030 #0a0a0a;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{background-color:#303030;} -.btn-primary:active,.btn-primary.active{background-color:#161616 \9;} +.btn-primary{background-color:#0049cd;background-image:-moz-linear-gradient(top, #0064cd, #0020cd);background-image:-ms-linear-gradient(top, #0064cd, #0020cd);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#0064cd), to(#0020cd));background-image:-webkit-linear-gradient(top, #0064cd, #0020cd);background-image:-o-linear-gradient(top, #0064cd, #0020cd);background-image:linear-gradient(top, #0064cd, #0020cd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#0064cd', endColorstr='#0020cd', GradientType=0);border-color:#0020cd #0020cd #001481;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{background-color:#0020cd;} +.btn-primary:active,.btn-primary.active{background-color:#00189a \9;} .btn-warning{background-color:#faa732;background-image:-moz-linear-gradient(top, #fbb450, #f89406);background-image:-ms-linear-gradient(top, #fbb450, #f89406);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));background-image:-webkit-linear-gradient(top, #fbb450, #f89406);background-image:-o-linear-gradient(top, #fbb450, #f89406);background-image:linear-gradient(top, #fbb450, #f89406);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0);border-color:#f89406 #f89406 #ad6704;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{background-color:#f89406;} .btn-warning:active,.btn-warning.active{background-color:#c67605 \9;} .btn-danger{background-color:#da4f49;background-image:-moz-linear-gradient(top, #ee5f5b, #bd362f);background-image:-ms-linear-gradient(top, #ee5f5b, #bd362f);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));background-image:-webkit-linear-gradient(top, #ee5f5b, #bd362f);background-image:-o-linear-gradient(top, #ee5f5b, #bd362f);background-image:linear-gradient(top, #ee5f5b, #bd362f);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0);border-color:#bd362f #bd362f #802420;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-danger:hover,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{background-color:#bd362f;} @@ -329,7 +329,7 @@ .hide{display:none;} .show{display:block;} .invisible{visibility:hidden;} -@font-face{font-family:'IconicStroke';src:url('../images/fonts/iconic_stroke.eot');src:url('../images/fonts/iconic_stroke.eot?#iefix') format('embedded-opentype'),url('../images/fonts/iconic_stroke.ttf') format('truetype'),url('../images/fonts/iconic_stroke.svg#iconic') format('svg');font-weight:normal;font-style:normal;}.iconic{display:inline-block;font-family:'IconicStroke';} +@font-face{font-family:'IconicStroke';src:url('/static/images/fonts/iconic_stroke.eot');src:url('/static/images/fonts/iconic_stroke.eot?#iefix') format('embedded-opentype'),url('../images/fonts/iconic_stroke.ttf') format('truetype'),url('../images/fonts/iconic_stroke.svg#iconic') format('svg');font-weight:normal;font-style:normal;}.iconic{display:inline-block;font-family:'IconicStroke';} .iconic.lightbulb:before{content:'\e063';} .iconic.equalizer:before{content:'\e052';} .iconic.map_pin_stroke:before{content:'\e068';} @@ -480,9 +480,156 @@ .iconic.arrow_right_alt2:before{content:'\e019';} .iconic.rss_alt:before{content:'\e02d';} .iconic.spin_alt:before{content:'\e037';} +@font-face{font-family:'FontAwesome';src:url('../images/fonts/fontawesome-webfont.eot');src:url('../images/fonts/fontawesome-webfont.eot?#iefix') format('embedded-opentype'),url('../images/fonts/fontawesome-webfont.woff') format('woff'),url('../images/fonts/fontawesome-webfont.ttf') format('truetype'),url('../images/fonts/fontawesome-webfont.svgz#FontAwesomeRegular') format('svg'),url('../images/fonts/fontawesome-webfont.svg#FontAwesomeRegular') format('svg');font-weight:normal;font-style:normal;}.ficon,[class^="ficon"]:before,[class*=" ficon"]:before{font-family:FontAwesome;font-weight:normal;font-style:normal;display:inline-block;} +.ficon.large:before{font-size:1.3333333333333333em;} +.btn [class^="ficon"],.btn [class*=" ficon"]{line-height:.9em;} +li [class^="ficon"],li [class*=" ficon"]{display:inline-block;width:1.25em;text-align:center;} +li .ficon.large[class^="ficon"],li .ficon.large[class*=" ficon"]{width:1.875em;} +li[class^="ficon"],li[class*=" ficon"]{margin-left:0;list-style-type:none;}li[class^="ficon"]:before,li[class*=" ficon"]:before{text-indent:-2em;text-align:center;} +li[class^="ficon"].ficon.large:before,li[class*=" ficon"].ficon.large:before{text-indent:-1.3333333333333333em;} +.ficon.glass:before{content:"\f000";} +.ficon.music:before{content:"\f001";} +.ficon.search:before{content:"\f002";} +.ficon.envelope:before{content:"\f003";} +.ficon.heart:before{content:"\f004";} +.ficon.star:before{content:"\f005";} +.ficon.star-empty:before{content:"\f006";} +.ficon.user:before{content:"\f007";} +.ficon.film:before{content:"\f008";} +.ficon.th-large:before{content:"\f009";} +.ficon.th:before{content:"\f00a";} +.ficon.th-list:before{content:"\f00b";} +.ficon.ok:before{content:"\f00c";} +.ficon.remove:before{content:"\f00d";} +.ficon.zoom-in:before{content:"\f00e";} +.ficon.zoom-out:before{content:"\f010";} +.ficon.off:before{content:"\f011";} +.ficon.signal:before{content:"\f012";} +.ficon.cog:before{content:"\f013";} +.ficon.trash:before{content:"\f014";} +.ficon.home:before{content:"\f015";} +.ficon.file:before{content:"\f016";} +.ficon.time:before{content:"\f017";} +.ficon.road:before{content:"\f018";} +.ficon.download-alt:before{content:"\f019";} +.ficon.download:before{content:"\f01a";} +.ficon.upload:before{content:"\f01b";} +.ficon.inbox:before{content:"\f01c";} +.ficon.play-circle:before{content:"\f01d";} +.ficon.repeat:before{content:"\f01e";} +.ficon.refresh:before{content:"\f021";} +.ficon.list-alt:before{content:"\f022";} +.ficon.lock:before{content:"\f023";} +.ficon.flag:before{content:"\f024";} +.ficon.headphones:before{content:"\f025";} +.ficon.volume-off:before{content:"\f026";} +.ficon.volume-down:before{content:"\f027";} +.ficon.volume-up:before{content:"\f028";} +.ficon.qrcode:before{content:"\f029";} +.ficon.barcode:before{content:"\f02a";} +.ficon.tag:before{content:"\f02b";} +.ficon.tags:before{content:"\f02c";} +.ficon.book:before{content:"\f02d";} +.ficon.bookmark:before{content:"\f02e";} +.ficon.print:before{content:"\f02f";} +.ficon.camera:before{content:"\f030";} +.ficon.font:before{content:"\f031";} +.ficon.bold:before{content:"\f032";} +.ficon.italic:before{content:"\f033";} +.ficon.text-height:before{content:"\f034";} +.ficon.text-width:before{content:"\f035";} +.ficon.align-left:before{content:"\f036";} +.ficon.align-center:before{content:"\f037";} +.ficon.align-right:before{content:"\f038";} +.ficon.align-justify:before{content:"\f039";} +.ficon.list:before{content:"\f03a";} +.ficon.indent-left:before{content:"\f03b";} +.ficon.indent-right:before{content:"\f03c";} +.ficon.facetime-video:before{content:"\f03d";} +.ficon.picture:before{content:"\f03e";} +.ficon.pencil:before{content:"\f040";} +.ficon.map-marker:before{content:"\f041";} +.ficon.adjust:before{content:"\f042";} +.ficon.tint:before{content:"\f043";} +.ficon.edit:before{content:"\f044";} +.ficon.share:before{content:"\f045";} +.ficon.check:before{content:"\f046";} +.ficon.move:before{content:"\f047";} +.ficon.step-backward:before{content:"\f048";} +.ficon.fast-backward:before{content:"\f049";} +.ficon.backward:before{content:"\f04a";} +.ficon.play:before{content:"\f04b";} +.ficon.pause:before{content:"\f04c";} +.ficon.stop:before{content:"\f04d";} +.ficon.forward:before{content:"\f04e";} +.ficon.fast-forward:before{content:"\f050";} +.ficon.step-forward:before{content:"\f051";} +.ficon.eject:before{content:"\f052";} +.ficon.chevron-left:before{content:"\f053";} +.ficon.chevron-right:before{content:"\f054";} +.ficon.plus-sign:before{content:"\f055";} +.ficon.minus-sign:before{content:"\f056";} +.ficon.remove-sign:before{content:"\f057";} +.ficon.ok-sign:before{content:"\f058";} +.ficon.question-sign:before{content:"\f059";} +.ficon.info-sign:before{content:"\f05a";} +.ficon.screenshot:before{content:"\f05b";} +.ficon.remove-circle:before{content:"\f05c";} +.ficon.ok-circle:before{content:"\f05d";} +.ficon.ban-circle:before{content:"\f05e";} +.ficon.arrow-left:before{content:"\f060";} +.ficon.arrow-right:before{content:"\f061";} +.ficon.arrow-up:before{content:"\f062";} +.ficon.arrow-down:before{content:"\f063";} +.ficon.share-alt:before{content:"\f064";} +.ficon.resize-full:before{content:"\f065";} +.ficon.resize-small:before{content:"\f066";} +.ficon.plus:before{content:"\f067";} +.ficon.minus:before{content:"\f068";} +.ficon.asterisk:before{content:"\f069";} +.ficon.exclamation-sign:before{content:"\f06a";} +.ficon.gift:before{content:"\f06b";} +.ficon.leaf:before{content:"\f06c";} +.ficon.fire:before{content:"\f06d";} +.ficon.eye-open:before{content:"\f06e";} +.ficon.eye-close:before{content:"\f070";} +.ficon.warning-sign:before{content:"\f071";} +.ficon.plane:before{content:"\f072";} +.ficon.calendar:before{content:"\f073";} +.ficon.random:before{content:"\f074";} +.ficon.comment:before{content:"\f075";} +.ficon.magnet:before{content:"\f076";} +.ficon.chevron-up:before{content:"\f077";} +.ficon.chevron-down:before{content:"\f078";} +.ficon.retweet:before{content:"\f079";} +.ficon.shopping-cart:before{content:"\f07a";} +.ficon.folder-close:before{content:"\f07b";} +.ficon.folder-open:before{content:"\f07c";} +.ficon.resize-vertical:before{content:"\f07d";} +.ficon.resize-horizontal:before{content:"\f07e";} +.ficon.bar-chart:before{content:"\f080";} +.ficon.twitter-sign:before{content:"\f081";} +.ficon.facebook-sign:before{content:"\f082";} +.ficon.camera-retro:before{content:"\f083";} +.ficon.key:before{content:"\f084";} +.ficon.cogs:before{content:"\f085";} +.ficon.comments:before{content:"\f086";} +.ficon.thumbs-up:before{content:"\f087";} +.ficon.thumbs-down:before{content:"\f088";} +.ficon.star-half:before{content:"\f089";} +.ficon.heart-empty:before{content:"\f08a";} +.ficon.signout:before{content:"\f08b";} +.ficon.linkedin-sign:before{content:"\f08c";} +.ficon.pushpin:before{content:"\f08d";} +.ficon.external-link:before{content:"\f08e";} +.ficon.signin:before{content:"\f090";} +.ficon.trophy:before{content:"\f091";} +.ficon.github-sign:before{content:"\f092";} +.ficon.upload-alt:before{content:"\f093";} +.ficon.lemon:before{content:"\f094";} .unselectable{-webkit-user-select:none;-moz-user-select:none;-o-user-select:none;user-select:none;} .shadow{-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25);} -.parent-width{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;width:100%;} +.parent-width{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;width:100%;*width:90%;} .clear{*zoom:1;}.clear:before,.clear:after{display:table;content:"";} .clear:after{clear:both;} body{background:#ffffff;color:#303030;background-image:url(base_bg.png);background-repeat:repeat-x;background-position:top;margin:10px;} @@ -507,12 +654,12 @@ .unified-panel-footer{-webkit-user-select:none;-moz-user-select:none;-o-user-select:none;user-select:none;position:absolute;bottom:0;height:25px;line-height:25px;width:100%;z-index:1000;border-top:solid #999999 1px;background-color:#f0f0f0;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), color-stop(25%, #f2f2f2), to(#e6e6e6));background-image:-webkit-linear-gradient(#f2f2f2, #f2f2f2 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #f2f2f2, #f2f2f2 25%, #e6e6e6);background-image:-ms-linear-gradient(#f2f2f2, #f2f2f2 25%, #e6e6e6);background-image:-o-linear-gradient(#f2f2f2, #f2f2f2 25%, #e6e6e6);background-image:linear-gradient(#f2f2f2, #f2f2f2 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f2f2f2', endColorstr='#e6e6e6', GradientType=0);color:#555;}.unified-panel-footer a{color:#555;} .unified-panel-footer .drag{position:absolute;top:0;right:0;padding:0 5px;text-align:center;height:25px;width:20px;background-image:url(../images/visualization/draggable_horizontal.png);background-repeat:no-repeat;background-position:50% 50%;cursor:w-resize;} #right>.unified-panel-footer .drag{left:0;} -.panel-collapse{-webkit-user-select:none;-moz-user-select:none;-o-user-select:none;user-select:none;position:absolute;bottom:0;height:25px;line-height:25px;width:100%;z-index:1000;border-top:solid #999999 1px;background-color:#f0f0f0;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), color-stop(25%, #f2f2f2), to(#e6e6e6));background-image:-webkit-linear-gradient(#f2f2f2, #f2f2f2 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #f2f2f2, #f2f2f2 25%, #e6e6e6);background-image:-ms-linear-gradient(#f2f2f2, #f2f2f2 25%, #e6e6e6);background-image:-o-linear-gradient(#f2f2f2, #f2f2f2 25%, #e6e6e6);background-image:linear-gradient(#f2f2f2, #f2f2f2 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f2f2f2', endColorstr='#e6e6e6', GradientType=0);color:#555;z-index:10000;position:fixed;left:0;top:inherit;bottom:0;padding:0 5px;text-align:center;width:20px;background:none;border-right:solid #999999 1px;border-top:solid #999999 1px;background-color:#f0f0f0;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), color-stop(25%, #f2f2f2), to(#e6e6e6));background-image:-webkit-linear-gradient(#f2f2f2, #f2f2f2 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #f2f2f2, #f2f2f2 25%, #e6e6e6);background-image:-ms-linear-gradient(#f2f2f2, #f2f2f2 25%, #e6e6e6);background-image:-o-linear-gradient(#f2f2f2, #f2f2f2 25%, #e6e6e6);background-image:linear-gradient(#f2f2f2, #f2f2f2 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f2f2f2', endColorstr='#e6e6e6', GradientType=0);display:inline-block;font-family:'IconicStroke';}.panel-collapse a{color:#555;} +.panel-collapse{-webkit-user-select:none;-moz-user-select:none;-o-user-select:none;user-select:none;position:absolute;bottom:0;height:25px;line-height:25px;width:100%;z-index:1000;border-top:solid #999999 1px;background-color:#f0f0f0;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), color-stop(25%, #f2f2f2), to(#e6e6e6));background-image:-webkit-linear-gradient(#f2f2f2, #f2f2f2 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #f2f2f2, #f2f2f2 25%, #e6e6e6);background-image:-ms-linear-gradient(#f2f2f2, #f2f2f2 25%, #e6e6e6);background-image:-o-linear-gradient(#f2f2f2, #f2f2f2 25%, #e6e6e6);background-image:linear-gradient(#f2f2f2, #f2f2f2 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f2f2f2', endColorstr='#e6e6e6', GradientType=0);color:#555;z-index:10000;position:fixed;left:0;top:inherit;bottom:0;padding:0 5px;text-align:center;width:20px;background:none;border-right:solid #999999 1px;border-top:solid #999999 1px;background-color:#f0f0f0;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), color-stop(25%, #f2f2f2), to(#e6e6e6));background-image:-webkit-linear-gradient(#f2f2f2, #f2f2f2 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #f2f2f2, #f2f2f2 25%, #e6e6e6);background-image:-ms-linear-gradient(#f2f2f2, #f2f2f2 25%, #e6e6e6);background-image:-o-linear-gradient(#f2f2f2, #f2f2f2 25%, #e6e6e6);background-image:linear-gradient(#f2f2f2, #f2f2f2 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f2f2f2', endColorstr='#e6e6e6', GradientType=0);font-family:FontAwesome;font-weight:normal;font-style:normal;display:inline-block;font-size:1.3333333333333333em;}.panel-collapse a{color:#555;} .panel-collapse .drag{position:absolute;top:0;right:0;padding:0 5px;text-align:center;height:25px;width:20px;background-image:url(../images/visualization/draggable_horizontal.png);background-repeat:no-repeat;background-position:50% 50%;cursor:w-resize;} -.panel-collapse:before{content:'\2190';} -.panel-collapse.hidden:before{content:'\2192';} -.panel-collapse.right{left:inherit;right:0;border-right:none;border-left:solid #999999 1px;}.panel-collapse.right.right:before{content:'\2192';} -.panel-collapse.right.right.hidden:before{content:'\2190';} +.panel-collapse:before{content:'\f053';} +.panel-collapse.hidden:before{content:'\f054';} +.panel-collapse.right{left:inherit;right:0;border-right:none;border-left:solid #999999 1px;}.panel-collapse.right.right:before{content:'\f054';} +.panel-collapse.right.right.hidden:before{content:'\f053';} .menu-bg{background:whiteSmoke top repeat-x;} div.unified-panel-body{position:absolute;top:30px;bottom:0;width:100%;margin-top:1px;} #left>div.unified-panel-body,#right>div.unified-panel-body{bottom:25px;} @@ -547,16 +694,6 @@ .quota-meter-bar-warn{background-color:#ffb400;} .quota-meter-bar-error{background-color:#ff4343;} .quota-meter-text{position:absolute;top:50%;left:0;width:100px;height:16px;margin-top:-6px;text-align:center;z-index:9001;color:#000000;} -div.toolForm{border:solid #d8b365 1px;} -div.toolFormTitle{font-weight:bold;padding:5px;padding-left:10px;padding-right:10px;background:#ebd9b2;background-repeat:repeat-x;background-position:top;border-bottom:solid #d8b365 1px;} -div.toolParamHelp{color:#666;} -div.toolParamHelp a{color:#666;} -div.toolFormBody{background:#ffffff;background-image:url(form_body_bg.png);background-repeat:repeat-x;background-position:top;padding:5px 0;} -div.toolFormBody div.toolFormTitle{background:transparent;border:none;font-weight:bold;border-bottom:solid #d8b365 1px;margin-bottom:5px;} -div.toolFormDisabled div.toolFormTitle{background:#eeeeee;border-color:#999999;} -div.toolFormDisabled{border-color:#999999;} -div.toolHelp{margin-top:10px;} -div.toolHelpBody{width:100%;} div.metadataForm{border:solid #aaaaaa 1px;} div.metadataFormTitle{font-weight:bold;padding:5px;padding-left:10px;padding-right:10px;background:#cccccc;background-repeat:repeat-x;background-position:top;border-bottom:solid #aaaaaa 1px;} div.metadataFormBody{background:#FFFFFF;background-image:url(form_body_bg.png);background-repeat:repeat-x;background-position:top;padding:5px 0;} @@ -565,8 +702,13 @@ div.metadataFormDisabled{border-color:#999;} div.metadataHelpBody{width:100%;overflow:auto;} div.titleRow{font-weight:bold;border-bottom:dotted gray 1px;margin-bottom:0.5em;padding-bottom:0.25em;} -div.form{border:solid #d8b365 1px;} -div.form-title{font-weight:bold;padding:5px 10px;background:#ebd9b2;background-image:url(form_title_bg.png);background-repeat:repeat-x;background-position:top;border-bottom:solid #d8b365 1px;} +div.toolFormBody{background:#ffffff;background-image:url(form_body_bg.png);background-repeat:repeat-x;background-position:top;padding:5px 0;} +div.toolFormBody div.toolFormTitle{background:transparent;border:none;font-weight:bold;border-bottom:solid #d8b365 1px;margin-bottom:5px;} +div.toolFormDisabled div.toolFormTitle{background:#eeeeee;border-color:#999999;} +div.toolFormDisabled{border-color:#999999;} +div.toolHelp{margin-top:15px;padding:5px;} +div.toolHelpBody{width:100%;} +div.form-title,div.toolFormTitle{font-size:15px;line-height:24px;padding:5px 10px;background:#ebd9b2;border-bottom:solid #d8b365 1px;} div.form-body{padding:5px 0;} div.form-row{padding:5px 10px;} div.form-title-row{padding:5px 10px;} @@ -577,13 +719,16 @@ div.form-row-input{width:300px;float:left;} div.form-row-input label{font-weight:normal;display:inline;} div.form-row-error-message{width:300px;float:left;color:red;font-weight:bold;padding:3px 0;} -.form-row .help{color:#666;} +.form-row .help,.toolParamHelp{color:#666;}.form-row .help a,.toolParamHelp a{color:#666;} +.form-row.form-actions{background:whiteSmoke;border-top:solid #ddd 1px;padding-top:10px;padding-bottom:10px;margin-top:5px;} +select{padding:4px;font-size:12px;line-height:16px;} select,input,textarea{font:inherit;} select,textarea,input[type="text"],input[type="file"],input[type="password"]{max-width:300px;} -.search-query{display:inline-block;padding:4px;margin-bottom:9px;font-size:12px;line-height:16px;color:#555555;border:1px solid #999999;padding-left:14px;padding-right:14px;margin-bottom:0;-webkit-border-radius:14px;-moz-border-radius:14px;border-radius:14px;max-width:auto;} -.search-query:focus{border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);outline:0;outline:thin dotted \9;} +textarea,input[type="text"],input[type="password"]{font-size:12px;line-height:16px;border:1px solid #999999;padding:3px;} +.search-query{display:inline-block;padding:4px;font-size:12px;line-height:16px;color:#555555;border:1px solid #999999;padding-left:14px !important;padding-right:14px !important;margin-bottom:0;-webkit-border-radius:14px;-moz-border-radius:14px;border-radius:14px;max-width:auto;} +.search-query:focus{border-color:rgba(24, 132, 218, 0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);outline:0;outline:thin dotted \9;} .search-spinner{position:absolute;display:none;right:8px;top:10px;} -.errormessagelarge,.warningmessagelarge,.donemessagelarge,.infomessagelarge{padding:8px 35px 8px 14px;margin-bottom:16px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#ffffcc;border:1px solid #ffdd33;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;color:#666600;min-height:32px;padding-left:52px;background-image:url(error_message_icon.png);background-repeat:no-repeat;background-position:10px 10px;} +.errormessagelarge,.warningmessagelarge,.donemessagelarge,.infomessagelarge{padding:8px 35px 8px 14px;margin-bottom:16px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#ffffcc;border:1px solid #ffdd33;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;color:#666600;min-height:36px;padding-left:52px;background-image:url(error_message_icon.png);background-repeat:no-repeat;background-position:10px 10px;} .errormessagelarge{background-color:#ffcccc;border-color:#ff3355;color:#660000;padding-left:52px;} .warningmessagelarge{background-image:url(warn_message_icon.png);border-color:#aaaa66;background-color:#ffffcc;} .donemessagelarge{background-color:#ccffcc;border-color:#1a9900;color:#006600;padding-left:52px;background-image:url(done_message_icon.png);} @@ -622,6 +767,18 @@ .grid thead th{line-height:16px;background:#ebd9b2;background-repeat:repeat-x;background-position:top;border-top:solid #d8b365 1px;border-bottom:solid #d8b365 1px;padding:5px;text-align:left;white-space:nowrap;} .grid tfoot td{background-color:#F8F8F8;border-top:solid #DDDDDD 1px;border-bottom:solid #DDDDDD 1px;padding:5px;} .grid .current{background-color:#EEEEFF;} +.count-box{min-width:1.1em;padding:5px;border-width:1px;border-style:solid;text-align:center;display:inline-block;} +.text-filter-val{border:solid 1px #AAAAAA;padding:1px 2px 1px 3px;margin-right:5px;-moz-border-radius:.5em;-webkit-border-radius:.5em;font-style:italic;} +.page-link a,.inactive-link{padding:0px 7px 0px 7px;color:#555;} +.inactive-link,.current-filter{font-weight:bold;color:#000;} +.submit-image{background:url(../images/fugue/magnifier-left.png) no-repeat center transparent;background-color:#eee;width:24px;height:24px;cursor:pointer;margin:0;padding:0;display:block;border:1px solid #aaa;border-left:none;} +#advanced-search td{padding:3px;} +#advanced-search table{border-collapse:separate;} +.delete-search-icon{background:url(../images/delete_tag_icon_gray.png) center no-repeat;display:inline-block;width:10px;cursor:pointer;height:18px;vertical-align:middle;margin-left:2px;} +.search-box-input{border:0;float:left;outline:medium none;font-style:italic;font-size:inherit;} +.search-box{vertical-align:bottom;display:inline-block;padding:0;} +.gray-background{background-color:#DDDDDD;} +.loading-elt-overlay{background-color:white;opacity:0.5;width:100%;height:100%;z-index:14000;position:fixed;display:none;} div.odd_row{background:#dadfef;} #footer{display:none;} span.toolParameterExpandableCollapsable{font-weight:bold;cursor:pointer;} @@ -644,13 +801,14 @@ .state-fg-ok{color:#66AA66;} .state-fg-error{color:#AA6666;} .state-fg-deleted{color:#3399FF;} -button{display:inline-block;padding:4px 10px 4px;font-size:12px;line-height:16px;color:#333333;text-align:center;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#fafafa;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border:1px solid #999999;border-bottom-color:#888888;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;*margin-left:.3em;}button:first-child{*margin-left:0;} -.action-button{display:inline-block;padding:4px 10px 4px;font-size:12px;line-height:16px;color:#333333;text-align:center;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#fafafa;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border:1px solid #999999;border-bottom-color:#888888;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;*margin-left:.3em;}.action-button:first-child{*margin-left:0;} +.action-button{display:inline-block;padding:4px 10px 4px;font-size:12px;line-height:16px;color:#111111;text-align:center;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#fafafa;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border:1px solid #999999;border-bottom-color:#888888;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;*margin-left:.3em;}.action-button:first-child{*margin-left:0;} +.action-button [class^="ficon"],.action-button [class*=" ficon"]{line-height:.9em;} a.action-button{text-decoration:none;} .action-button>img{vertical-align:middle;} -.action-button:hover{color:#333333;text-decoration:none;background-color:#e6e6e6;background-position:0 -15px;-webkit-transition:background-position 0.1s linear;-moz-transition:background-position 0.1s linear;-ms-transition:background-position 0.1s linear;-o-transition:background-position 0.1s linear;transition:background-position 0.1s linear;} +.action-button:hover{color:#111111;text-decoration:none;background-color:#e6e6e6;background-position:0 -15px;-webkit-transition:background-position 0.1s linear;-moz-transition:background-position 0.1s linear;-ms-transition:background-position 0.1s linear;-o-transition:background-position 0.1s linear;transition:background-position 0.1s linear;} .action-button:active{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);background-color:#e6e6e6;background-color:#d9d9d9 \9;outline:0;} -.menubutton{display:inline-block;padding:4px 10px 4px;font-size:12px;line-height:16px;color:#333333;text-align:center;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#fafafa;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border:1px solid #999999;border-bottom-color:#888888;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;*margin-left:.3em;display:inline-block;cursor:pointer;position:relative;-webkit-user-select:none;-moz-user-select:none;-o-user-select:none;user-select:none;}.menubutton:first-child{*margin-left:0;} +.menubutton{display:inline-block;padding:4px 10px 4px;font-size:12px;line-height:16px;color:#111111;text-align:center;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#fafafa;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border:1px solid #999999;border-bottom-color:#888888;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;*margin-left:.3em;display:inline-block;cursor:pointer;position:relative;-webkit-user-select:none;-moz-user-select:none;-o-user-select:none;user-select:none;}.menubutton:first-child{*margin-left:0;} +.menubutton [class^="ficon"],.menubutton [class*=" ficon"]{line-height:.9em;} .menubutton .label{position:relative;border-right:none;text-decoration:none;} .menubutton.popup .label{border-right:solid #999999 1px;padding-right:6px;} .menubutton.popup:after{margin-top:6px;display:inline-block;width:0;height:0;text-indent:-99999px;*text-indent:0;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #000000;opacity:0.3;filter:alpha(opacity=30);content:"\2193";} diff -r 484c3bfb7f3e24213447ea45ed273c328e599eb8 -r 551adce80d002272ce47a850834c26b8b63028a7 static/june_2007_style/bootstrap/buttons.less --- a/static/june_2007_style/bootstrap/buttons.less +++ b/static/june_2007_style/bootstrap/buttons.less @@ -11,7 +11,7 @@ padding: 4px 10px 4px; font-size: @baseFontSize; line-height: @baseLineHeight; - color: @grayDark; + color: @textColor; text-align: center; text-shadow: 0 1px 1px rgba(255,255,255,.75); #gradient > .vertical-three-colors(@white, @white, 25%, darken(@white, 10%)); // Don't use .gradientbar() here since it does a three-color gradient @@ -29,7 +29,7 @@ // Hover state .btn.hover, .btn:hover { - color: @grayDark; + color: @textColor; text-decoration: none; background-color: darken(@white, 10%); background-position: 0 -15px; diff -r 484c3bfb7f3e24213447ea45ed273c328e599eb8 -r 551adce80d002272ce47a850834c26b8b63028a7 static/june_2007_style/fontawesome/font-awesome.less --- /dev/null +++ b/static/june_2007_style/fontawesome/font-awesome.less @@ -0,0 +1,218 @@ +@font-face { + font-family: 'FontAwesome'; + src: url('../images/fonts/fontawesome-webfont.eot'); + src: url('../images/fonts/fontawesome-webfont.eot?#iefix') format('embedded-opentype'), + url('../images/fonts/fontawesome-webfont.woff') format('woff'), + url('../images/fonts/fontawesome-webfont.ttf') format('truetype'), + url('../images/fonts/fontawesome-webfont.svgz#FontAwesomeRegular') format('svg'), + url('../images/fonts/fontawesome-webfont.svg#FontAwesomeRegular') format('svg'); + font-weight: normal; + font-style: normal; +} + +// ICONS +// Glyphs and icons for buttons, nav, and more +// ------------------------------------------- +// Font Awesome courtesy of Dave Gandy at fortaweso.me/font-awesome + +.ficon, +[class^="ficon"]:before, +[class*=" ficon"]:before { + font-family: FontAwesome; + font-weight: normal; + font-style: normal; + display: inline-block; +} + +// makes the font 33% larger relative to the icon container +.ficon.large:before { +// display: inline-block; + font-size: 4/3em; +} + +.btn { + [class^="ficon"], + [class*=" ficon"] { + line-height: .9em; // keeps button heights with and without icons the same + } +} + +li { + [class^="ficon"], + [class*=" ficon"] { + display: inline-block; + width: 1.25em; + text-align: center; + } + .ficon.large[class^="ficon"], + .ficon.large[class*=" ficon"] { + width: 1.5*1.25em; // 1.5 increased font size for icon-large * 1.25 width + } +} + +li[class^="ficon"], +li[class*=" ficon"] { + margin-left: 0; + list-style-type: none; + + &:before { + text-indent: -2em; + text-align: center; + } + &.ficon.large:before { + text-indent: -4/3em; + } +} + +// Uses Unicode Private Use Area (PUA) to ensure screen readers do not read off +// random characters that represent icons +.ficon.glass:before { content: "\f000"; } +.ficon.music:before { content: "\f001"; } +.ficon.search:before { content: "\f002"; } +.ficon.envelope:before { content: "\f003"; } +.ficon.heart:before { content: "\f004"; } +.ficon.star:before { content: "\f005"; } +.ficon.star-empty:before { content: "\f006"; } +.ficon.user:before { content: "\f007"; } +.ficon.film:before { content: "\f008"; } +.ficon.th-large:before { content: "\f009"; } +.ficon.th:before { content: "\f00a"; } +.ficon.th-list:before { content: "\f00b"; } +.ficon.ok:before { content: "\f00c"; } +.ficon.remove:before { content: "\f00d"; } +.ficon.zoom-in:before { content: "\f00e"; } + +.ficon.zoom-out:before { content: "\f010"; } +.ficon.off:before { content: "\f011"; } +.ficon.signal:before { content: "\f012"; } +.ficon.cog:before { content: "\f013"; } +.ficon.trash:before { content: "\f014"; } +.ficon.home:before { content: "\f015"; } +.ficon.file:before { content: "\f016"; } +.ficon.time:before { content: "\f017"; } +.ficon.road:before { content: "\f018"; } +.ficon.download-alt:before { content: "\f019"; } +.ficon.download:before { content: "\f01a"; } +.ficon.upload:before { content: "\f01b"; } +.ficon.inbox:before { content: "\f01c"; } +.ficon.play-circle:before { content: "\f01d"; } +.ficon.repeat:before { content: "\f01e"; } + +// \f020 is not a valid unicode character. all shifted one down +.ficon.refresh:before { content: "\f021"; } +.ficon.list-alt:before { content: "\f022"; } +.ficon.lock:before { content: "\f023"; } +.ficon.flag:before { content: "\f024"; } +.ficon.headphones:before { content: "\f025"; } +.ficon.volume-off:before { content: "\f026"; } +.ficon.volume-down:before { content: "\f027"; } +.ficon.volume-up:before { content: "\f028"; } +.ficon.qrcode:before { content: "\f029"; } +.ficon.barcode:before { content: "\f02a"; } +.ficon.tag:before { content: "\f02b"; } +.ficon.tags:before { content: "\f02c"; } +.ficon.book:before { content: "\f02d"; } +.ficon.bookmark:before { content: "\f02e"; } +.ficon.print:before { content: "\f02f"; } + +.ficon.camera:before { content: "\f030"; } +.ficon.font:before { content: "\f031"; } +.ficon.bold:before { content: "\f032"; } +.ficon.italic:before { content: "\f033"; } +.ficon.text-height:before { content: "\f034"; } +.ficon.text-width:before { content: "\f035"; } +.ficon.align-left:before { content: "\f036"; } +.ficon.align-center:before { content: "\f037"; } +.ficon.align-right:before { content: "\f038"; } +.ficon.align-justify:before { content: "\f039"; } +.ficon.list:before { content: "\f03a"; } +.ficon.indent-left:before { content: "\f03b"; } +.ficon.indent-right:before { content: "\f03c"; } +.ficon.facetime-video:before { content: "\f03d"; } +.ficon.picture:before { content: "\f03e"; } + +.ficon.pencil:before { content: "\f040"; } +.ficon.map-marker:before { content: "\f041"; } +.ficon.adjust:before { content: "\f042"; } +.ficon.tint:before { content: "\f043"; } +.ficon.edit:before { content: "\f044"; } +.ficon.share:before { content: "\f045"; } +.ficon.check:before { content: "\f046"; } +.ficon.move:before { content: "\f047"; } +.ficon.step-backward:before { content: "\f048"; } +.ficon.fast-backward:before { content: "\f049"; } +.ficon.backward:before { content: "\f04a"; } +.ficon.play:before { content: "\f04b"; } +.ficon.pause:before { content: "\f04c"; } +.ficon.stop:before { content: "\f04d"; } +.ficon.forward:before { content: "\f04e"; } + +.ficon.fast-forward:before { content: "\f050"; } +.ficon.step-forward:before { content: "\f051"; } +.ficon.eject:before { content: "\f052"; } +.ficon.chevron-left:before { content: "\f053"; } +.ficon.chevron-right:before { content: "\f054"; } +.ficon.plus-sign:before { content: "\f055"; } +.ficon.minus-sign:before { content: "\f056"; } +.ficon.remove-sign:before { content: "\f057"; } +.ficon.ok-sign:before { content: "\f058"; } +.ficon.question-sign:before { content: "\f059"; } +.ficon.info-sign:before { content: "\f05a"; } +.ficon.screenshot:before { content: "\f05b"; } +.ficon.remove-circle:before { content: "\f05c"; } +.ficon.ok-circle:before { content: "\f05d"; } +.ficon.ban-circle:before { content: "\f05e"; } + +.ficon.arrow-left:before { content: "\f060"; } +.ficon.arrow-right:before { content: "\f061"; } +.ficon.arrow-up:before { content: "\f062"; } +.ficon.arrow-down:before { content: "\f063"; } +.ficon.share-alt:before { content: "\f064"; } +.ficon.resize-full:before { content: "\f065"; } +.ficon.resize-small:before { content: "\f066"; } +.ficon.plus:before { content: "\f067"; } +.ficon.minus:before { content: "\f068"; } +.ficon.asterisk:before { content: "\f069"; } +.ficon.exclamation-sign:before { content: "\f06a"; } +.ficon.gift:before { content: "\f06b"; } +.ficon.leaf:before { content: "\f06c"; } +.ficon.fire:before { content: "\f06d"; } +.ficon.eye-open:before { content: "\f06e"; } + +.ficon.eye-close:before { content: "\f070"; } +.ficon.warning-sign:before { content: "\f071"; } +.ficon.plane:before { content: "\f072"; } +.ficon.calendar:before { content: "\f073"; } +.ficon.random:before { content: "\f074"; } +.ficon.comment:before { content: "\f075"; } +.ficon.magnet:before { content: "\f076"; } +.ficon.chevron-up:before { content: "\f077"; } +.ficon.chevron-down:before { content: "\f078"; } +.ficon.retweet:before { content: "\f079"; } +.ficon.shopping-cart:before { content: "\f07a"; } +.ficon.folder-close:before { content: "\f07b"; } +.ficon.folder-open:before { content: "\f07c"; } +.ficon.resize-vertical:before { content: "\f07d"; } +.ficon.resize-horizontal:before { content: "\f07e"; } + +.ficon.bar-chart:before { content: "\f080"; } +.ficon.twitter-sign:before { content: "\f081"; } +.ficon.facebook-sign:before { content: "\f082"; } +.ficon.camera-retro:before { content: "\f083"; } +.ficon.key:before { content: "\f084"; } +.ficon.cogs:before { content: "\f085"; } +.ficon.comments:before { content: "\f086"; } +.ficon.thumbs-up:before { content: "\f087"; } +.ficon.thumbs-down:before { content: "\f088"; } +.ficon.star-half:before { content: "\f089"; } +.ficon.heart-empty:before { content: "\f08a"; } +.ficon.signout:before { content: "\f08b"; } +.ficon.linkedin-sign:before { content: "\f08c"; } +.ficon.pushpin:before { content: "\f08d"; } +.ficon.external-link:before { content: "\f08e"; } + +.ficon.signin:before { content: "\f090"; } +.ficon.trophy:before { content: "\f091"; } +.ficon.github-sign:before { content: "\f092"; } +.ficon.upload-alt:before { content: "\f093"; } +.ficon.lemon:before { content: "\f094"; } diff -r 484c3bfb7f3e24213447ea45ed273c328e599eb8 -r 551adce80d002272ce47a850834c26b8b63028a7 static/june_2007_style/galaxy_bootstrap.less --- a/static/june_2007_style/galaxy_bootstrap.less +++ b/static/june_2007_style/galaxy_bootstrap.less @@ -35,10 +35,10 @@ @monospaceFontFamily: Menlo, Monaco, "Courier New", monospace; @baseFontFamily: @sansFontFamily; @baseLineHeight: 16px; -@textColor: @grayDark; +@textColor: #111; // Buttons -@primaryButtonBackground: @linkColor; +@primaryButtonBackground: @blueDark; @buttonBorder: #999; @buttonBorderBottom: #888; diff -r 484c3bfb7f3e24213447ea45ed273c328e599eb8 -r 551adce80d002272ce47a850834c26b8b63028a7 static/june_2007_style/iconic_stroke.less --- a/static/june_2007_style/iconic_stroke.less +++ b/static/june_2007_style/iconic_stroke.less @@ -1,7 +1,7 @@ @font-face { font-family: 'IconicStroke'; - src: url('../images/fonts/iconic_stroke.eot'); - src: url('../images/fonts/iconic_stroke.eot?#iefix') format('embedded-opentype'), url('../images/fonts/iconic_stroke.ttf') format('truetype'), url('../images/fonts/iconic_stroke.svg#iconic') format('svg'); + src: url('/static/images/fonts/iconic_stroke.eot'); + src: url('/static/images/fonts/iconic_stroke.eot?#iefix') format('embedded-opentype'), url('../images/fonts/iconic_stroke.ttf') format('truetype'), url('../images/fonts/iconic_stroke.svg#iconic') format('svg'); font-weight: normal; font-style: normal; } diff -r 484c3bfb7f3e24213447ea45ed273c328e599eb8 -r 551adce80d002272ce47a850834c26b8b63028a7 static/scripts/galaxy.base.js --- a/static/scripts/galaxy.base.js +++ b/static/scripts/galaxy.base.js @@ -62,15 +62,12 @@ } $.each( options, function( k, v ) { if (v) { - $("<a href='#'>").html(k).click(v).appendTo(menu_element).wrap( "<li />" ); + menu_element.append( $("<li></li>").append( $("<a href='#'></a>").html(k).click(v) ) ); } else { - $("<a href='#'>").html(k).appendTo(menu_element).wrap( "<li class='head'/>" ); + menu_element.append( $("<li></li>").addClass( "head" ).append( $("<a href='#'></a>").html(k) ) ); } }); - var wrapper = $( "<div class='popmenu-wrapper' style='position: absolute;left: 0; top: -1000;'>" ); - wrapper.append( menu_element ) - .append( "<div class='overlay-border'>" ) - .appendTo( "body" ); + var wrapper = $( "<div class='popmenu-wrapper' style='position: absolute;left: 0; top: -1000;'></div>" ).append( menu_element ).appendTo( "body" ); var x = e.pageX - wrapper.width() / 2 ; x = Math.min( x, $(document).scrollLeft() + $(window).width() - $(wrapper).width() - 5 ); diff -r 484c3bfb7f3e24213447ea45ed273c328e599eb8 -r 551adce80d002272ce47a850834c26b8b63028a7 templates/base_panels.mako --- a/templates/base_panels.mako +++ b/templates/base_panels.mako @@ -1,5 +1,4 @@ -## This needs to be on the first line, otherwise IE6 goes into quirks mode -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<!DOCTYPE HTML><% self.has_left_panel=True @@ -204,7 +203,10 @@ <head><title>${self.title()}</title><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + ## For mobile browsers, don't scale up <meta name = "viewport" content = "maximum-scale=1.0"> + ## Force IE to standards mode, and prefer Google Chrome Frame if the user has already installed it + <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> ${self.stylesheets()} ${self.javascripts()} </head> diff -r 484c3bfb7f3e24213447ea45ed273c328e599eb8 -r 551adce80d002272ce47a850834c26b8b63028a7 templates/grid_base.mako --- a/templates/grid_base.mako +++ b/templates/grid_base.mako @@ -619,85 +619,6 @@ ${parent.stylesheets()} ${h.css( "autocomplete_tagging", "jquery.rating" )} <style> - .count-box { - min-width: 1.1em; - padding: 5px; - border-width: 1px; - border-style: solid; - text-align: center; - display: inline-block; - } - .text-filter-val { - border: solid 1px #AAAAAA; - padding: 1px 2px 1px 3px; - margin-right: 5px; - -moz-border-radius: .5em; - -webkit-border-radius: .5em; - font-style: italic; - } - .page-link a, .inactive-link { - padding: 0px 7px 0px 7px; - color: #555; - } - .inactive-link, .current-filter { - font-weight: bold; - color: #000; - } - .submit-image { - background: url(${h.url_for('/static/images/fugue/magnifier-left.png')}) no-repeat right transparent; - background-color: #eee; - width: 20px; - height: 20px; - cursor: pointer; - border: 0; - border-left: 1px solid #ccc; - margin: 0; - padding: 0; - display: block; - float: right; - } - #advanced-search td { - padding: 3px; - } - #advanced-search table { - border-collapse: separate; - } - .delete-search-icon { - background: url(${h.url_for("/static/images/delete_tag_icon_gray.png")}) center no-repeat; - display: inline-block; - width: 10px; - cursor: pointer; - height: 18px; - vertical-align: middle; - margin-left: 2px; - - } - .search-box-input { - border: 0; - margin: 1px 0 0 2px; - float: left; - outline: medium none; - font-style: italic; - font-size: inherit; - } - .search-box { - vertical-align: bottom; - display: inline-block; - padding: 0; - border: 1px solid #aaa; - } - .gray-background { - background-color: #DDDDDD; - } - .loading-elt-overlay { - background-color : white; - opacity : 0.5; - width : 100%; - height : 100%; - z-index : 14000; - position : fixed; - display: none; - } ## If page is displayed in panels, pad from edges for readability. %if context.get('use_panels'): div#center { diff -r 484c3bfb7f3e24213447ea45ed273c328e599eb8 -r 551adce80d002272ce47a850834c26b8b63028a7 templates/root/index.mako --- a/templates/root/index.mako +++ b/templates/root/index.mako @@ -201,7 +201,7 @@ <div class="unified-panel-header" unselectable="on"><div class='unified-panel-header-inner'><div style="float: right"> - <a class='panel-header-button' id="tools-options-button" href="#"><span class="iconic cog"></span></a> + <a class='panel-header-button' id="tools-options-button" href="#"><span class="ficon large cog"></span></a></div> ${n_('Tools')} </div> @@ -235,7 +235,7 @@ <div class="unified-panel-header" unselectable="on"><div class="unified-panel-header-inner"><div style="float: right"> - <a id="history-options-button" class='panel-header-button' href="${h.url_for( controller='root', action='history_options' )}" target="galaxy_main"><span class="iconic cog"></span></a> + <a id="history-options-button" class='panel-header-button' href="${h.url_for( controller='root', action='history_options' )}" target="galaxy_main"><span class="ficon large cog"></span></a></div><div class="panel-header-text">${_('History')}</div></div> diff -r 484c3bfb7f3e24213447ea45ed273c328e599eb8 -r 551adce80d002272ce47a850834c26b8b63028a7 templates/root/tool_menu.mako --- a/templates/root/tool_menu.mako +++ b/templates/root/tool_menu.mako @@ -50,7 +50,7 @@ </div></%def> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<!DOCTYPE HTML><html><head><title>${_('Galaxy Tools')}</title> @@ -59,7 +59,6 @@ <link href="${h.url_for('/static/style/tool_menu.css')}" rel="stylesheet" type="text/css" /><link href="${h.url_for('/static/style/autocomplete_tagging.css')}" rel="stylesheet" type="text/css" /> - ##<script type="text/javascript" src="${h.url_for('/static/scripts/jquery.js')}"></script> ${h.js( "jquery", "galaxy.base", "json2", "autocomplete_tagging" )} <script type="text/javascript"> diff -r 484c3bfb7f3e24213447ea45ed273c328e599eb8 -r 551adce80d002272ce47a850834c26b8b63028a7 templates/tool_form.mako --- a/templates/tool_form.mako +++ b/templates/tool_form.mako @@ -139,13 +139,13 @@ %><div class="form-title-row"><strong>${input.title} ${i + 1}</strong></div> ${do_inputs( input.inputs, repeat_state[i], rep_errors, prefix + input.name + "_" + str(index) + "|", other_values )} - <div class="form-row"><input type="submit" name="${prefix}${input.name}_${index}_remove" value="Remove ${input.title} ${i+1}"></div> + <div class="form-row"><input type="submit" class="btn" name="${prefix}${input.name}_${index}_remove" value="Remove ${input.title} ${i+1}"></div></div> %if rep_errors.has_key( '__index__' ): <div><img style="vertical-align: middle;" src="${h.url_for('/static/style/error_small.png')}"> <span style="vertical-align: middle;">${rep_errors['__index__']}</span></div> %endif %endfor - <div class="form-row"><input type="submit" name="${prefix}${input.name}_add" value="Add new ${input.title}"></div> + <div class="form-row"><input type="submit" class="btn" name="${prefix}${input.name}_add" value="Add new ${input.title}"></div></div> %elif input.type == "conditional": <% @@ -290,14 +290,14 @@ <input type="hidden" name="tool_state" value="${util.object_to_string( tool_state.encode( tool, app ) )}"> %if tool.display_by_page[tool_state.page]: ${trans.fill_template_string( tool.display_by_page[tool_state.page], context=tool.get_param_html_map( trans, tool_state.page, tool_state.inputs ) )} - <input type="submit" class="primary-button" name="runtool_btn" value="Execute"> + <input type="submit" class="btn btn-primary" name="runtool_btn" value="Execute"> %else: ${do_inputs( tool.inputs_by_page[ tool_state.page ], tool_state.inputs, errors, "" )} - <div class="form-row"> + <div class="form-row form-actions"> %if tool_state.page == tool.last_page: - <input type="submit" class="primary-button" name="runtool_btn" value="Execute"> + <input type="submit" class="btn btn-primary" name="runtool_btn" value="Execute"> %else: - <input type="submit" class="primary-button" name="runtool_btn" value="Next step"> + <input type="submit" class="btn btn-primary" name="runtool_btn" value="Next step"> %endif </div> %endif diff -r 484c3bfb7f3e24213447ea45ed273c328e599eb8 -r 551adce80d002272ce47a850834c26b8b63028a7 templates/webapps/galaxy/base_panels.mako --- a/templates/webapps/galaxy/base_panels.mako +++ b/templates/webapps/galaxy/base_panels.mako @@ -44,31 +44,28 @@ <a class="${a_cls}" data-toggle="dropdown">${display}${extra}</a> %endif %if menu_options: - ## <div class="submenu"><ul class="dropdown-menu"> %for menu_item in menu_options: %if not menu_item: - <li class="divider" /> + <li class="divider"></li> %else: <li> %if len ( menu_item ) == 1: ${menu_item[0]} %elif len ( menu_item ) == 2: <% name, link = menu_item %> - <a href="${link}">${name}</a></li> + <a href="${link}">${name}</a> %else: <% name, link, target = menu_item %> - <a target="${target}" href="${link}">${name}</a></li> + <a target="${target}" href="${link}">${name}</a> %endif </li> %endif %endfor </ul> - ## </div> %endif </li></%def> - ## Analyze data tab. ${tab( "analysis", _("Analyze Data"), h.url_for( controller='/root', action='index' ) )} @@ -151,7 +148,7 @@ email = trans.user.email else: email = "" - menu_options = [ [ '<li><a>Logged in as <span id="user-email">%s</span></a></li>' % email ] ] + menu_options = [ [ '<a>Logged in as <span id="user-email">%s</span></a>' % email ] ] if app.config.use_remote_user: if app.config.remote_user_logout_href: menu_options.append( [ _('Logout'), app.config.remote_user_logout_href, "_top" ] ) @@ -173,7 +170,7 @@ menu_options.append( [ _('API Keys'), h.url_for( controller='/user', action='api_keys', cntrller='user', webapp='galaxy' ), "galaxy_main" ] ) if app.config.use_remote_user: menu_options.append( [ _('Public Name'), h.url_for( controller='/user', action='edit_username', cntrller='user', webapp='galaxy' ), "galaxy_main" ] ) - + extra_class = "loggedin-only" visible = ( trans.user != None ) tab( "user", "User", None, visible=visible, menu_options=menu_options ) @@ -187,9 +184,9 @@ </div> ## Logo, layered over tabs to be clickable - <div class="title" style="position: absolute; top: 0; left: 0;"> + <div class="title" style="position: absolute; top: 0; left: 0; white-space: nowrap;"><a href="${app.config.get( 'logo_url', '/' )}"> - <img border="0" src="${h.url_for('/static/images/galaxyIcon_noText.png')}" style="width: 26px; vertical-align: top;"> + <img border="0" src="${h.url_for('/static/images/galaxyIcon_noText.png')}" style="display: inline; width: 26px; vertical-align: top;"> Galaxy %if app.config.brand: <span class='brand'>/ ${app.config.brand}</span> https://bitbucket.org/galaxy/galaxy-central/changeset/9017c8ecb8a6/ changeset: 9017c8ecb8a6 user: james_taylor date: 2012-03-09 19:38:13 summary: Automated merge with https://bitbucket.org/galaxy/galaxy-central affected #: 81 files Diff too large to display. https://bitbucket.org/galaxy/galaxy-central/changeset/e5603d63ea14/ changeset: e5603d63ea14 user: james_taylor date: 2012-03-09 20:41:52 summary: style: smaller button height, fix toolForm styles in workflow editor affected #: 5 files diff -r 9017c8ecb8a641482e75c512b09ef8ce0651ba64 -r e5603d63ea141605327204a889f8fb48173e02f0 static/june_2007_style/base.less --- a/static/june_2007_style/base.less +++ b/static/june_2007_style/base.less @@ -573,6 +573,15 @@ width: 100%; } +// In workflow + +.toolForm.toolFormInCanvas { + border: solid @form_border 1px; + .toolFormTitle { + font-size: @baseFontSize; + line-height: @baseLineHeight; + } +} div.form, div.toolForm { @@ -658,7 +667,7 @@ // Selects select { //border: 1px solid @formElementBorder; - padding: 4px; + padding: 2px; font-size: @baseFontSize; line-height: @baseLineHeight; } diff -r 9017c8ecb8a641482e75c512b09ef8ce0651ba64 -r e5603d63ea141605327204a889f8fb48173e02f0 static/june_2007_style/blue/base.css --- a/static/june_2007_style/blue/base.css +++ b/static/june_2007_style/blue/base.css @@ -95,7 +95,7 @@ .fade{-webkit-transition:opacity 0.15s linear;-moz-transition:opacity 0.15s linear;-ms-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;opacity:0;}.fade.in{opacity:1;} .collapse{-webkit-transition:height 0.35s ease;-moz-transition:height 0.35s ease;-ms-transition:height 0.35s ease;-o-transition:height 0.35s ease;transition:height 0.35s ease;position:relative;overflow:hidden;height:0;}.collapse.in{height:auto;} .close{float:right;font-size:20px;font-weight:bold;line-height:16px;color:#000000;text-shadow:0 1px 0 #ffffff;opacity:0.2;filter:alpha(opacity=20);}.close:hover{color:#000000;text-decoration:none;opacity:0.4;filter:alpha(opacity=40);cursor:pointer;} -.btn{display:inline-block;padding:4px 10px 4px;font-size:12px;line-height:16px;color:#111111;text-align:center;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#fafafa;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border:1px solid #999999;border-bottom-color:#888888;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;*margin-left:.3em;}.btn:first-child{*margin-left:0;} +.btn{display:inline-block;padding:2px 10px 2px;font-size:12px;line-height:16px;color:#111111;text-align:center;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#fafafa;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border:1px solid #999999;border-bottom-color:#888888;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;*margin-left:.3em;}.btn:first-child{*margin-left:0;} .btn.hover,.btn:hover{color:#111111;text-decoration:none;background-color:#e6e6e6;background-position:0 -15px;-webkit-transition:background-position 0.1s linear;-moz-transition:background-position 0.1s linear;-ms-transition:background-position 0.1s linear;-o-transition:background-position 0.1s linear;transition:background-position 0.1s linear;} .btn:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;} .btn.active,.btn:active{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);background-color:#e6e6e6;background-color:#d9d9d9 \9;outline:0;} @@ -329,157 +329,6 @@ .hide{display:none;} .show{display:block;} .invisible{visibility:hidden;} -@font-face{font-family:'IconicStroke';src:url('/static/images/fonts/iconic_stroke.eot');src:url('/static/images/fonts/iconic_stroke.eot?#iefix') format('embedded-opentype'),url('../images/fonts/iconic_stroke.ttf') format('truetype'),url('../images/fonts/iconic_stroke.svg#iconic') format('svg');font-weight:normal;font-style:normal;}.iconic{display:inline-block;font-family:'IconicStroke';} -.iconic.lightbulb:before{content:'\e063';} -.iconic.equalizer:before{content:'\e052';} -.iconic.map_pin_stroke:before{content:'\e068';} -.iconic.brush_alt:before{content:'\e01c';} -.iconic.move:before{content:'\e03e';} -.iconic.pen_alt_stroke:before{content:'\e005';} -.iconic.move_vertical:before{content:'\e03b';} -.iconic.book_alt2:before{content:'\e06a';} -.iconic.layers:before{content:'\e01f';} -.iconic.pause:before{content:'\e049';} -.iconic.layers_alt:before{content:'\e020';} -.iconic.cloud_upload:before{content:'\e045';} -.iconic.chart_alt:before{content:'\e029';} -.iconic.fullscreen_exit_alt:before{content:'\e051';} -.iconic.cloud_download:before{content:'\e044';} -.iconic.comment_alt2_stroke:before{content:'\e004';} -.iconic.mail:before{content:'\2709';} -.iconic.check_alt:before{content:'\2718';} -.iconic.document_stroke:before{content:'\e066';} -.iconic.battery_charging:before{content:'\e05d';} -.iconic.stop:before{content:'\e04a';} -.iconic.arrow_up:before{content:'\2191';} -.iconic.move_horizontal:before{content:'\e038';} -.iconic.compass:before{content:'\e021';} -.iconic.minus_alt:before{content:'\e009';} -.iconic.battery_empty:before{content:'\e05c';} -.iconic.map_pin_alt:before{content:'\e002';} -.iconic.unlock_stroke:before{content:'\e076';} -.iconic.lock_stroke:before{content:'\e075';} -.iconic.question_mark:before{content:'\003f';} -.iconic.list:before{content:'\e055';} -.iconic.upload:before{content:'\e043';} -.iconic.reload:before{content:'\e030';} -.iconic.loop_alt4:before{content:'\e035';} -.iconic.loop_alt3:before{content:'\e034';} -.iconic.loop_alt2:before{content:'\e033';} -.iconic.loop_alt1:before{content:'\e032';} -.iconic.left_quote:before{content:'\275d';} -.iconic.x:before{content:'\2713';} -.iconic.last:before{content:'\e04d';} -.iconic.document_alt_stroke:before{content:'\e000';} -.iconic.bars:before{content:'\e06f';} -.iconic.arrow_left:before{content:'\2190';} -.iconic.arrow_down:before{content:'\2193';} -.iconic.download:before{content:'\e042';} -.iconic.home:before{content:'\2302';} -.iconic.calendar:before{content:'\e001';} -.iconic.right_quote_alt:before{content:'\e012';} -.iconic.fullscreen:before{content:'\e04e';} -.iconic.dial:before{content:'\e058';} -.iconic.plus_alt:before{content:'\e008';} -.iconic.clock:before{content:'\e079';} -.iconic.movie:before{content:'\e060';} -.iconic.steering_wheel:before{content:'\e024';} -.iconic.pen:before{content:'\270e';} -.iconic.tag_stroke:before{content:'\e02b';} -.iconic.pin:before{content:'\e067';} -.iconic.denied:before{content:'\26d4';} -.iconic.left_quote_alt:before{content:'\e011';} -.iconic.volume_mute:before{content:'\e071';} -.iconic.arrow_up_alt2:before{content:'\e018';} -.iconic.list_nested:before{content:'\e056';} -.iconic.arrow_up_alt1:before{content:'\e014';} -.iconic.comment_stroke:before{content:'\e06d';} -.iconic.undo:before{content:'\e02f';} -.iconic.umbrella:before{content:'\2602';} -.iconic.bolt:before{content:'\26a1';} -.iconic.article:before{content:'\e053';} -.iconic.read_more:before{content:'\e054';} -.iconic.beaker:before{content:'\e023';} -.iconic.beaker_alt:before{content:'\e010';} -.iconic.battery_full:before{content:'\e073';} -.iconic.arrow_right:before{content:'\2192';} -.iconic.new_window:before{content:'\e059';} -.iconic.plus:before{content:'\2795';} -.iconic.cog:before{content:'\2699';} -.iconic.key_stroke:before{content:'\26bf';} -.iconic.first:before{content:'\e04c';} -.iconic.comment_alt1_stroke:before{content:'\e003';} -.iconic.trash_stroke:before{content:'\e05a';} -.iconic.image:before{content:'\e027';} -.iconic.chat_alt_stroke:before{content:'\e007';} -.iconic.cd:before{content:'\e064';} -.iconic.right_quote:before{content:'\275e';} -.iconic.brush:before{content:'\e01b';} -.iconic.cloud:before{content:'\2601';} -.iconic.eye:before{content:'\e025';} -.iconic.play_alt:before{content:'\e048';} -.iconic.transfer:before{content:'\e041';} -.iconic.pen_alt2:before{content:'\e006';} -.iconic.camera:before{content:'\e070';} -.iconic.move_horizontal_alt2:before{content:'\e03a';} -.iconic.curved_arrow:before{content:'\2935';} -.iconic.move_horizontal_alt1:before{content:'\e039';} -.iconic.aperture:before{content:'\e026';} -.iconic.reload_alt:before{content:'\e031';} -.iconic.magnifying_glass:before{content:'\e074';} -.iconic.iphone:before{content:'\e06e';} -.iconic.fork:before{content:'\e046';} -.iconic.box:before{content:'\e06b';} -.iconic.bars_alt:before{content:'\e00a';} -.iconic.heart_stroke:before{content:'\2764';} -.iconic.volume:before{content:'\e072';} -.iconic.x_alt:before{content:'\2714';} -.iconic.link:before{content:'\e077';} -.iconic.moon_stroke:before{content:'\263e';} -.iconic.eyedropper:before{content:'\e01e';} -.iconic.spin:before{content:'\e036';} -.iconic.rss:before{content:'\e02c';} -.iconic.info:before{content:'\2139';} -.iconic.target:before{content:'\e02a';} -.iconic.cursor:before{content:'\e057';} -.iconic.minus:before{content:'\2796';} -.iconic.book_alt:before{content:'\e00b';} -.iconic.headphones:before{content:'\e061';} -.iconic.hash:before{content:'\0023';} -.iconic.arrow_left_alt1:before{content:'\e013';} -.iconic.arrow_left_alt2:before{content:'\e017';} -.iconic.fullscreen_exit:before{content:'\e050';} -.iconic.share:before{content:'\e02e';} -.iconic.fullscreen_alt:before{content:'\e04f';} -.iconic.at:before{content:'\0040';} -.iconic.chat:before{content:'\e05e';} -.iconic.move_vertical_alt2:before{content:'\e03d';} -.iconic.move_vertical_alt1:before{content:'\e03c';} -.iconic.check:before{content:'\2717';} -.iconic.mic:before{content:'\e05f';} -.iconic.calendar_alt_stroke:before{content:'\e06c';} -.iconic.book:before{content:'\e069';} -.iconic.move_alt1:before{content:'\e03f';} -.iconic.move_alt2:before{content:'\e040';} -.iconic.award_stroke:before{content:'\e022';} -.iconic.wrench:before{content:'\e078';} -.iconic.play:before{content:'\e047';} -.iconic.star:before{content:'\2605';} -.iconic.chart:before{content:'\e028';} -.iconic.rain:before{content:'\26c6';} -.iconic.folder_stroke:before{content:'\e065';} -.iconic.sun_stroke:before{content:'\2600';} -.iconic.user:before{content:'\e062';} -.iconic.battery_half:before{content:'\e05b';} -.iconic.aperture_alt:before{content:'\e00c';} -.iconic.eject:before{content:'\e04b';} -.iconic.arrow_down_alt1:before{content:'\e016';} -.iconic.pilcrow:before{content:'\00b6';} -.iconic.arrow_down_alt2:before{content:'\e01a';} -.iconic.arrow_right_alt1:before{content:'\e015';} -.iconic.arrow_right_alt2:before{content:'\e019';} -.iconic.rss_alt:before{content:'\e02d';} -.iconic.spin_alt:before{content:'\e037';} @font-face{font-family:'FontAwesome';src:url('../images/fonts/fontawesome-webfont.eot');src:url('../images/fonts/fontawesome-webfont.eot?#iefix') format('embedded-opentype'),url('../images/fonts/fontawesome-webfont.woff') format('woff'),url('../images/fonts/fontawesome-webfont.ttf') format('truetype'),url('../images/fonts/fontawesome-webfont.svgz#FontAwesomeRegular') format('svg'),url('../images/fonts/fontawesome-webfont.svg#FontAwesomeRegular') format('svg');font-weight:normal;font-style:normal;}.ficon,[class^="ficon"]:before,[class*=" ficon"]:before{font-family:FontAwesome;font-weight:normal;font-style:normal;display:inline-block;} .ficon.large:before{font-size:1.3333333333333333em;} .btn [class^="ficon"],.btn [class*=" ficon"]{line-height:.9em;} @@ -708,6 +557,7 @@ div.toolFormDisabled{border-color:#999999;} div.toolHelp{margin-top:15px;padding:5px;} div.toolHelpBody{width:100%;} +.toolForm.toolFormInCanvas{border:solid #d8b365 1px;}.toolForm.toolFormInCanvas .toolFormTitle{font-size:12px;line-height:16px;} div.form-title,div.toolFormTitle{font-size:15px;line-height:24px;padding:5px 10px;background:#ebd9b2;border-bottom:solid #d8b365 1px;} div.form-body{padding:5px 0;} div.form-row{padding:5px 10px;} @@ -721,7 +571,7 @@ div.form-row-error-message{width:300px;float:left;color:red;font-weight:bold;padding:3px 0;} .form-row .help,.toolParamHelp{color:#666;}.form-row .help a,.toolParamHelp a{color:#666;} .form-row.form-actions{background:whiteSmoke;border-top:solid #ddd 1px;padding-top:10px;padding-bottom:10px;margin-top:5px;} -select{padding:4px;font-size:12px;line-height:16px;} +select{padding:2px;font-size:12px;line-height:16px;} select,input,textarea{font:inherit;} select,textarea,input[type="text"],input[type="file"],input[type="password"]{max-width:300px;} textarea,input[type="text"],input[type="password"]{font-size:12px;line-height:16px;border:1px solid #999999;padding:3px;} @@ -801,13 +651,13 @@ .state-fg-ok{color:#66AA66;} .state-fg-error{color:#AA6666;} .state-fg-deleted{color:#3399FF;} -.action-button{display:inline-block;padding:4px 10px 4px;font-size:12px;line-height:16px;color:#111111;text-align:center;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#fafafa;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border:1px solid #999999;border-bottom-color:#888888;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;*margin-left:.3em;}.action-button:first-child{*margin-left:0;} +.action-button{display:inline-block;padding:2px 10px 2px;font-size:12px;line-height:16px;color:#111111;text-align:center;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#fafafa;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border:1px solid #999999;border-bottom-color:#888888;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;*margin-left:.3em;}.action-button:first-child{*margin-left:0;} .action-button [class^="ficon"],.action-button [class*=" ficon"]{line-height:.9em;} a.action-button{text-decoration:none;} .action-button>img{vertical-align:middle;} .action-button:hover{color:#111111;text-decoration:none;background-color:#e6e6e6;background-position:0 -15px;-webkit-transition:background-position 0.1s linear;-moz-transition:background-position 0.1s linear;-ms-transition:background-position 0.1s linear;-o-transition:background-position 0.1s linear;transition:background-position 0.1s linear;} .action-button:active{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);background-color:#e6e6e6;background-color:#d9d9d9 \9;outline:0;} -.menubutton{display:inline-block;padding:4px 10px 4px;font-size:12px;line-height:16px;color:#111111;text-align:center;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#fafafa;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border:1px solid #999999;border-bottom-color:#888888;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;*margin-left:.3em;display:inline-block;cursor:pointer;position:relative;-webkit-user-select:none;-moz-user-select:none;-o-user-select:none;user-select:none;}.menubutton:first-child{*margin-left:0;} +.menubutton{display:inline-block;padding:2px 10px 2px;font-size:12px;line-height:16px;color:#111111;text-align:center;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#fafafa;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border:1px solid #999999;border-bottom-color:#888888;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;*margin-left:.3em;display:inline-block;cursor:pointer;position:relative;-webkit-user-select:none;-moz-user-select:none;-o-user-select:none;user-select:none;}.menubutton:first-child{*margin-left:0;} .menubutton [class^="ficon"],.menubutton [class*=" ficon"]{line-height:.9em;} .menubutton .label{position:relative;border-right:none;text-decoration:none;} .menubutton.popup .label{border-right:solid #999999 1px;padding-right:6px;} diff -r 9017c8ecb8a641482e75c512b09ef8ce0651ba64 -r e5603d63ea141605327204a889f8fb48173e02f0 static/june_2007_style/bootstrap/buttons.less --- a/static/june_2007_style/bootstrap/buttons.less +++ b/static/june_2007_style/bootstrap/buttons.less @@ -8,7 +8,7 @@ // Core .btn { display: inline-block; - padding: 4px 10px 4px; + padding: 2px 10px 2px; font-size: @baseFontSize; line-height: @baseLineHeight; color: @textColor; diff -r 9017c8ecb8a641482e75c512b09ef8ce0651ba64 -r e5603d63ea141605327204a889f8fb48173e02f0 static/scripts/galaxy.panels.js --- a/static/scripts/galaxy.panels.js +++ b/static/scripts/galaxy.panels.js @@ -144,14 +144,14 @@ var $buttons = this.$footer.find( ".buttons" ).html( "" ); if ( options.buttons ) { $.each( options.buttons, function( name, value ) { - $buttons.append( $( '<button>' ).text( name ).click( value ) ); + $buttons.append( $( '<button></button> ' ).text( name ).click( value ) ).append( " " ); }); this.$footer.show(); } var $extraButtons = this.$footer.find( ".extra_buttons" ).html( "" ); if ( options.extra_buttons ) { $.each( options.extra_buttons, function( name, value ) { - $extraButtons.append( $( '<button>' ).text( name ).click( value ) ); + $extraButtons.append( $( '<button></button>' ).text( name ).click( value ) ).append( " " ); }); this.$footer.show(); } diff -r 9017c8ecb8a641482e75c512b09ef8ce0651ba64 -r e5603d63ea141605327204a889f8fb48173e02f0 templates/workflow/editor.mako --- a/templates/workflow/editor.mako +++ b/templates/workflow/editor.mako @@ -955,8 +955,8 @@ display = "none" %><div id="tool-search" style="padding-bottom: 5px; position: relative; display: ${display}; width: 100%"> - <input type="text" name="query" value="search tools" id="tool-search-query" style="width: 100%; font-style:italic; font-size: inherit" autocomplete="off"/> - <img src="${h.url_for('/static/images/loading_small_white_bg.gif')}" id="search-spinner" style="display: none; position: absolute; right: 0; top: 5px;"/> + <input type="text" name="query" value="search tools" id="tool-search-query" class="search-query parent-width" /> + <img src="${h.url_for('/static/images/loading_small_white_bg.gif')}" id="search-spinner" class="search-spinner" /></div><div class="toolSectionList"> %for key, val in app.toolbox.tool_panel.items(): https://bitbucket.org/galaxy/galaxy-central/changeset/9e73daf2a338/ changeset: 9e73daf2a338 user: james_taylor date: 2012-03-12 18:09:19 summary: style: force monospace font and smaller size for pre.peek affected #: 2 files diff -r e5603d63ea141605327204a889f8fb48173e02f0 -r 9e73daf2a33878b35d2adc6d5b2eed5978bac7dc static/june_2007_style/base.less --- a/static/june_2007_style/base.less +++ b/static/june_2007_style/base.less @@ -1591,11 +1591,16 @@ background: white; color: black; width: 100%; + font-size: 10px; overflow: auto; th { color: white; background: @peek_table_header; } + table, th, tr, td { + font-family: @monospaceFontFamily; + font-size: 10px; + } } // ==== Tool menu styles diff -r e5603d63ea141605327204a889f8fb48173e02f0 -r 9e73daf2a33878b35d2adc6d5b2eed5978bac7dc static/june_2007_style/blue/base.css --- a/static/june_2007_style/blue/base.css +++ b/static/june_2007_style/blue/base.css @@ -730,7 +730,8 @@ div.historyItemTitleBar.spinner .state-icon{background:url(data_running.gif) 0 1px no-repeat !important;} div.historyItemButtons{float:right;} div.historyItemBody div{padding-top:2px;} -pre.peek{background:white;color:black;width:100%;overflow:auto;}pre.peek th{color:white;background:#023858;} +pre.peek{background:white;color:black;width:100%;font-size:10px;overflow:auto;}pre.peek th{color:white;background:#023858;} +pre.peek table,pre.peek th,pre.peek tr,pre.peek td{font-family:Menlo,Monaco,"Courier New",monospace;font-size:10px;} body.toolMenuPage{background:white;color:#303030;background:#dfe5f9;margin:5px;margin-right:10px;margin-left:10px;} hr{border:none;height:0px;margin-top:0px;} div.toolSectionPad{margin:0;padding:0;height:5px;font-size:0px;} https://bitbucket.org/galaxy/galaxy-central/changeset/fe149b078c86/ changeset: fe149b078c86 user: james_taylor date: 2012-03-12 18:09:38 summary: Automated merge with https://bitbucket.org/galaxy/galaxy-central affected #: 81 files Diff too large to display. https://bitbucket.org/galaxy/galaxy-central/changeset/35024e38e729/ changeset: 35024e38e729 user: james_taylor date: 2012-03-12 19:49:05 summary: style: use images with transparency for message boxes affected #: 17 files diff -r fe149b078c865e6d2b3f969f76195b3f53d9cb48 -r 35024e38e7292bb26474f10723754dbf96dea316 static/june_2007_style/base.less --- a/static/june_2007_style/base.less +++ b/static/june_2007_style/base.less @@ -728,7 +728,7 @@ .alert(); min-height: 36px; padding-left: 52px; - background-image: url(error_message_icon.png); + background-image: url(error_large.png); background-repeat: no-repeat; background-position: 10px 10px; } @@ -739,7 +739,7 @@ } .warningmessagelarge { - background-image: url(warn_message_icon.png); + background-image: url(warn_large.png); border-color: @warn_message_border; background-color: @warn_message_bg; } @@ -747,14 +747,14 @@ .donemessagelarge { .alert-success(); padding-left: 52px; - background-image: url(done_message_icon.png); + background-image: url(done_large.png); //border-color: @done_message_border; //background-color: @done_message_bg; } .infomessagelarge { .alert-info(); - background-image: url(info_message_icon.png); + background-image: url(info_large.png); border-color: @info_message_border; background-color: @info_message_bg; } diff -r fe149b078c865e6d2b3f969f76195b3f53d9cb48 -r 35024e38e7292bb26474f10723754dbf96dea316 static/june_2007_style/blue/base.css --- a/static/june_2007_style/blue/base.css +++ b/static/june_2007_style/blue/base.css @@ -578,11 +578,11 @@ .search-query{display:inline-block;padding:4px;font-size:12px;line-height:16px;color:#555555;border:1px solid #999999;padding-left:14px !important;padding-right:14px !important;margin-bottom:0;-webkit-border-radius:14px;-moz-border-radius:14px;border-radius:14px;max-width:auto;} .search-query:focus{border-color:rgba(24, 132, 218, 0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);outline:0;outline:thin dotted \9;} .search-spinner{position:absolute;display:none;right:8px;top:10px;} -.errormessagelarge,.warningmessagelarge,.donemessagelarge,.infomessagelarge{padding:8px 35px 8px 14px;margin-bottom:16px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#ffffcc;border:1px solid #ffdd33;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;color:#666600;min-height:36px;padding-left:52px;background-image:url(error_message_icon.png);background-repeat:no-repeat;background-position:10px 10px;} +.errormessagelarge,.warningmessagelarge,.donemessagelarge,.infomessagelarge{padding:8px 35px 8px 14px;margin-bottom:16px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#ffffcc;border:1px solid #ffdd33;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;color:#666600;min-height:36px;padding-left:52px;background-image:url(error_large.png);background-repeat:no-repeat;background-position:10px 10px;} .errormessagelarge{background-color:#ffcccc;border-color:#ff3355;color:#660000;padding-left:52px;} -.warningmessagelarge{background-image:url(warn_message_icon.png);border-color:#aaaa66;background-color:#ffffcc;} -.donemessagelarge{background-color:#ccffcc;border-color:#1a9900;color:#006600;padding-left:52px;background-image:url(done_message_icon.png);} -.infomessagelarge{background-color:#d9edf7;border-color:#1b7183;color:#134158;background-image:url(info_message_icon.png);border-color:#6666aa;background-color:#d9edf7;} +.warningmessagelarge{background-image:url(warn_large.png);border-color:#aaaa66;background-color:#ffffcc;} +.donemessagelarge{background-color:#ccffcc;border-color:#1a9900;color:#006600;padding-left:52px;background-image:url(done_large.png);} +.infomessagelarge{background-color:#d9edf7;border-color:#1b7183;color:#134158;background-image:url(info_large.png);border-color:#6666aa;background-color:#d9edf7;} .screencastBox{padding-left:10px;border-color:#AAAA66;background-color:#FFFFCC;background-image:none;} .errormessage,.warningmessage,.donemessage,.infomessage,.errormessagesmall,.warningmessagesmall,.donemessagesmall,.infomessagesmall{padding:8px 35px 8px 14px;margin-bottom:16px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#ffffcc;border:1px solid #ffdd33;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;color:#666600;padding:5px;padding-left:25px;min-height:15px;background-image:url(error_small.png);background-repeat:no-repeat;background-position:5px 5px;} .errormessage{background-color:#ffcccc;border-color:#ff3355;color:#660000;} diff -r fe149b078c865e6d2b3f969f76195b3f53d9cb48 -r 35024e38e7292bb26474f10723754dbf96dea316 static/june_2007_style/blue/data_empty.png Binary file static/june_2007_style/blue/data_empty.png has changed diff -r fe149b078c865e6d2b3f969f76195b3f53d9cb48 -r 35024e38e7292bb26474f10723754dbf96dea316 static/june_2007_style/blue/data_error.png Binary file static/june_2007_style/blue/data_error.png has changed diff -r fe149b078c865e6d2b3f969f76195b3f53d9cb48 -r 35024e38e7292bb26474f10723754dbf96dea316 static/june_2007_style/blue/data_ok.png Binary file static/june_2007_style/blue/data_ok.png has changed diff -r fe149b078c865e6d2b3f969f76195b3f53d9cb48 -r 35024e38e7292bb26474f10723754dbf96dea316 static/june_2007_style/blue/data_queued.png Binary file static/june_2007_style/blue/data_queued.png has changed diff -r fe149b078c865e6d2b3f969f76195b3f53d9cb48 -r 35024e38e7292bb26474f10723754dbf96dea316 static/june_2007_style/blue/error_large.png Binary file static/june_2007_style/blue/error_large.png has changed diff -r fe149b078c865e6d2b3f969f76195b3f53d9cb48 -r 35024e38e7292bb26474f10723754dbf96dea316 static/june_2007_style/blue/error_small.png Binary file static/june_2007_style/blue/error_small.png has changed diff -r fe149b078c865e6d2b3f969f76195b3f53d9cb48 -r 35024e38e7292bb26474f10723754dbf96dea316 static/june_2007_style/blue/info_large.png Binary file static/june_2007_style/blue/info_large.png has changed diff -r fe149b078c865e6d2b3f969f76195b3f53d9cb48 -r 35024e38e7292bb26474f10723754dbf96dea316 static/june_2007_style/blue/info_small.png Binary file static/june_2007_style/blue/info_small.png has changed diff -r fe149b078c865e6d2b3f969f76195b3f53d9cb48 -r 35024e38e7292bb26474f10723754dbf96dea316 static/june_2007_style/blue/ok_large.png Binary file static/june_2007_style/blue/ok_large.png has changed diff -r fe149b078c865e6d2b3f969f76195b3f53d9cb48 -r 35024e38e7292bb26474f10723754dbf96dea316 static/june_2007_style/blue/ok_small.png Binary file static/june_2007_style/blue/ok_small.png has changed diff -r fe149b078c865e6d2b3f969f76195b3f53d9cb48 -r 35024e38e7292bb26474f10723754dbf96dea316 static/june_2007_style/blue/trackster.css --- a/static/june_2007_style/blue/trackster.css +++ b/static/june_2007_style/blue/trackster.css @@ -31,11 +31,11 @@ .overlay{position:absolute;left:0;top:0;} .track-name{float:left;margin-top:2px;height:16px;} .label-track .track-content{background:white;} -.track-content{position:relative;} .track-tile{background:white;} .track-tile canvas{position:relative;z-index:100;} .tile-message{border-bottom:solid 1px red;text-align:center;color:red;background-color:white;} .track.error .track-content{background-color:#ECB4AF;background-image:none;} +.track-content{position:relative;} .track.nodata .track-content{background-color:#eee;background-image:none;} .track.pending .track-content{background-color:white;background-image:none;} .loading{min-height:100px;} diff -r fe149b078c865e6d2b3f969f76195b3f53d9cb48 -r 35024e38e7292bb26474f10723754dbf96dea316 static/june_2007_style/blue/wait_large.png Binary file static/june_2007_style/blue/wait_large.png has changed diff -r fe149b078c865e6d2b3f969f76195b3f53d9cb48 -r 35024e38e7292bb26474f10723754dbf96dea316 static/june_2007_style/blue/wait_small.png Binary file static/june_2007_style/blue/wait_small.png has changed diff -r fe149b078c865e6d2b3f969f76195b3f53d9cb48 -r 35024e38e7292bb26474f10723754dbf96dea316 static/june_2007_style/blue/warn_large.png Binary file static/june_2007_style/blue/warn_large.png has changed diff -r fe149b078c865e6d2b3f969f76195b3f53d9cb48 -r 35024e38e7292bb26474f10723754dbf96dea316 static/june_2007_style/blue/warn_small.png Binary file static/june_2007_style/blue/warn_small.png has changed https://bitbucket.org/galaxy/galaxy-central/changeset/fe460cfa0f00/ changeset: fe460cfa0f00 user: james_taylor date: 2012-03-12 20:02:02 summary: style: fix for ok/done icon affected #: 2 files diff -r 35024e38e7292bb26474f10723754dbf96dea316 -r fe460cfa0f00e0a23ec161b1c780f654dbdcb2af static/june_2007_style/base.less --- a/static/june_2007_style/base.less +++ b/static/june_2007_style/base.less @@ -358,7 +358,7 @@ .panel-done-message { - background-image: url(done_small.png); + background-image: url(ok_small.png); background-color: @done_message_bg; } @@ -480,6 +480,7 @@ text-align: center; z-index: 9001; color: @quota_meter_text; + white-space: nowrap; } @@ -747,7 +748,7 @@ .donemessagelarge { .alert-success(); padding-left: 52px; - background-image: url(done_large.png); + background-image: url(ok_large.png); //border-color: @done_message_border; //background-color: @done_message_bg; } diff -r 35024e38e7292bb26474f10723754dbf96dea316 -r fe460cfa0f00e0a23ec161b1c780f654dbdcb2af static/june_2007_style/blue/base.css --- a/static/june_2007_style/blue/base.css +++ b/static/june_2007_style/blue/base.css @@ -525,7 +525,7 @@ .dialog-box .buttons{padding:5px;} .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;} -.panel-done-message{background-image:url(done_small.png);background-color:#ccffcc;} +.panel-done-message{background-image:url(ok_small.png);background-color:#ccffcc;} .panel-info-message{background-image:url(info_small.png);background-color:#d9edf7;} #masthead{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;overflow:visible;margin-bottom:16px;position:absolute;top:0;left:0;width:100%;min-width:900px;height:32px;border-bottom:solid #444444 1px;z-index:15000;padding:0;}#masthead .brand:hover{text-decoration:none;} #masthead .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;font-size:20px;font-weight:200;line-height:1;color:#ffffff;} @@ -542,7 +542,7 @@ .quota-meter-bar{position:absolute;top:0;left:0;height:16px;background-color:#969db3;} .quota-meter-bar-warn{background-color:#ffb400;} .quota-meter-bar-error{background-color:#ff4343;} -.quota-meter-text{position:absolute;top:50%;left:0;width:100px;height:16px;margin-top:-6px;text-align:center;z-index:9001;color:#000000;} +.quota-meter-text{position:absolute;top:50%;left:0;width:100px;height:16px;margin-top:-6px;text-align:center;z-index:9001;color:#000000;white-space:nowrap;} div.metadataForm{border:solid #aaaaaa 1px;} div.metadataFormTitle{font-weight:bold;padding:5px;padding-left:10px;padding-right:10px;background:#cccccc;background-repeat:repeat-x;background-position:top;border-bottom:solid #aaaaaa 1px;} div.metadataFormBody{background:#FFFFFF;background-image:url(form_body_bg.png);background-repeat:repeat-x;background-position:top;padding:5px 0;} @@ -581,7 +581,7 @@ .errormessagelarge,.warningmessagelarge,.donemessagelarge,.infomessagelarge{padding:8px 35px 8px 14px;margin-bottom:16px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#ffffcc;border:1px solid #ffdd33;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;color:#666600;min-height:36px;padding-left:52px;background-image:url(error_large.png);background-repeat:no-repeat;background-position:10px 10px;} .errormessagelarge{background-color:#ffcccc;border-color:#ff3355;color:#660000;padding-left:52px;} .warningmessagelarge{background-image:url(warn_large.png);border-color:#aaaa66;background-color:#ffffcc;} -.donemessagelarge{background-color:#ccffcc;border-color:#1a9900;color:#006600;padding-left:52px;background-image:url(done_large.png);} +.donemessagelarge{background-color:#ccffcc;border-color:#1a9900;color:#006600;padding-left:52px;background-image:url(ok_large.png);} .infomessagelarge{background-color:#d9edf7;border-color:#1b7183;color:#134158;background-image:url(info_large.png);border-color:#6666aa;background-color:#d9edf7;} .screencastBox{padding-left:10px;border-color:#AAAA66;background-color:#FFFFCC;background-image:none;} .errormessage,.warningmessage,.donemessage,.infomessage,.errormessagesmall,.warningmessagesmall,.donemessagesmall,.infomessagesmall{padding:8px 35px 8px 14px;margin-bottom:16px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#ffffcc;border:1px solid #ffdd33;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;color:#666600;padding:5px;padding-left:25px;min-height:15px;background-image:url(error_small.png);background-repeat:no-repeat;background-position:5px 5px;} https://bitbucket.org/galaxy/galaxy-central/changeset/243ad28621be/ changeset: 243ad28621be user: james_taylor date: 2012-03-21 17:44:43 summary: Automated merge with https://bitbucket.org/galaxy/galaxy-central affected #: 95 files Diff too large to display. 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.