From f254740b1181cb4e159d7796511df61a05611456 Mon Sep 17 00:00:00 2001 From: James Home Date: Thu, 14 Oct 2010 23:31:27 +0000 Subject: [PATCH] refactor css, sidebar help UX, data table UX git-svn-id: http://google-refine.googlecode.com/svn/trunk@1549 7d457c2a-affb-35e4-300a-418c747d4874 --- .../webapp/modules/core/MOD-INF/controller.js | 4 +- .../webapp/modules/core/images/down-arrow.png | Bin 215 -> 971 bytes main/webapp/modules/core/images/edit-map.png | Bin 832 -> 1569 bytes .../modules/core/images/header-background.png | Bin 23653 -> 0 bytes .../modules/core/images/menu-dropdown.png | Bin 528 -> 1123 bytes .../modules/core/images/path-delimiter.png | Bin 155 -> 0 bytes main/webapp/modules/core/images/up-arrow.png | Bin 211 -> 976 bytes main/webapp/modules/core/project.vt | 4 +- main/webapp/modules/core/scripts/index.js | 1 + main/webapp/modules/core/scripts/project.js | 1 - .../core/scripts/project/browsing-engine.js | 6 +- .../core/scripts/project/extension-bar.js | 2 +- .../core/scripts/views/data-table/cell-ui.js | 2 +- .../core/scripts/widgets/history-widget.js | 7 +- main/webapp/modules/core/styles/common.less | 18 +++-- .../core/styles/jquery-ui-overrides.less | 8 ++- main/webapp/modules/core/styles/project.less | 20 ++---- .../project/{browsing.less => facets.less} | 45 +----------- .../history.less => project/sidebar.less} | 64 ++++++++++++++---- .../core/styles/views/data-table-view.less | 9 ++- 20 files changed, 96 insertions(+), 95 deletions(-) delete mode 100644 main/webapp/modules/core/images/header-background.png delete mode 100644 main/webapp/modules/core/images/path-delimiter.png rename main/webapp/modules/core/styles/project/{browsing.less => facets.less} (89%) rename main/webapp/modules/core/styles/{widgets/history.less => project/sidebar.less} (61%) diff --git a/main/webapp/modules/core/MOD-INF/controller.js b/main/webapp/modules/core/MOD-INF/controller.js index 9b586ac4a..8afe0e164 100644 --- a/main/webapp/modules/core/MOD-INF/controller.js +++ b/main/webapp/modules/core/MOD-INF/controller.js @@ -235,10 +235,10 @@ function init() { "styles/util/custom-suggest.less", "styles/project.less", - "styles/project/browsing.less", + "styles/project/sidebar.less", + "styles/project/facets.less", "styles/project/process.less", - "styles/widgets/history.less", "styles/widgets/histogram-widget.less", "styles/widgets/slider-widget.less", diff --git a/main/webapp/modules/core/images/down-arrow.png b/main/webapp/modules/core/images/down-arrow.png index 1b3eadf9cdf43a9a8d73f4263728e686bea96b57..f172a16234ca91c04ffc9d7cddd898870d6f3620 100644 GIT binary patch literal 971 zcmaJ=J#W)M7(Nk*N>L>`mZc{b!P5AX#I+Su1v{ojaTFzy$QZ}IBvxvlu`k5QgeoyG zqy7uTiUb1)vG5NNI}1p3La@O(O;QGeCHwAu^*qn}>1U1l{jJR#n*e|<>&R%*^D2Gw z8#(&DwPXCG#}27>NDKGL#EB88c({k46*vRbM2IeYV#fxf3P4~sT$M>-n%N3$5UX7#o^8@Y^b|SGj9&m!9D4B*R7AT^SOhe+N zg)rG$Di|nnV?QE34q>L~^zfKy49)bsgdkeUhRLE$v|(K8M4Z6#SxHNvZT}w{1S@nx zn&=|me+nnEQZ%S*S?WW8@GVw=q6mcCj(U1SdlrLA_Okw&VI?X3z1q zty*D1oX|y#fg4Ud!cZGF&#;zXrW@(e25utF@)Z zYVlD>w>_q7J*=EPrN2bJQEOKvN&5Ev*N@llKT*#m(yX_BgDh(^axcK`ucx(Z6bh_r-FSJgd-4ZJH!76? literal 215 zcmeAS@N?(olHy`uVBq!ia0vp^AT}EZ8<70{-y`i#Ng@b=d#Wzp$Pzm C%{(Lk diff --git a/main/webapp/modules/core/images/edit-map.png b/main/webapp/modules/core/images/edit-map.png index d34897929fe47195a92e0ab2f12615ea1a0e189f..dea0ed1ef4e1a8d301f58c9a24ce7ed3ea297bb6 100644 GIT binary patch literal 1569 zcmeAS@N?(olHy`uVBq!ia0vp^MnEjU!3HElqIG(Jlw^r(L`iUdT1k0gQ7VIDN`6wR zf@f}GdTLN=VoGJ<$y6H#24v4 zq}24xJX@vryZ0+8WTx0Eg`4^s_!c;)W@LI)6{QAO`Gq7`WhYyvDB0U7*i={n4aiL` zNmQuF&B-gas<2f8n`;GRgM{^!6u?SKvTcwn`Gtf;oFf&jvGt@IQ zHZeCh*HJJsFf`CNFw!?P(ls=ndS0-B(gnVDi`Y3yQQ>}q7{VqjotXz1c*X=!fZ;%w&ZVrt;# zXl&>R)9aF-T$-DjR|3v4~Pj*wm=R%;iu*SQ+p9GSx?XmOJ`tUn(FD|7*cU7 z>CgZF_J<1?bQF?q9W(#tu!_6m?23$UnhJWSKZ#p%JhBkKzi_5(b#*A;CI{9qhK(#! znNRX$ty8gmlhDL9A%)RkiX=~{rQwY?YkGL1xMWUvsTOSDWJ=HgMh9oohDyts5;ZzM z4BjLxH1RN#{e9xY%iHz_w+}Y3zmQaG%jT~OFumcOZkJr~@0lKpccGqNlVi|~sSoe0&FAs$jx(tF_mAJT=IFlf8dXZNtP*^2 ze-0gB=&4jT)!PuUYP-SVH*50~y<%ogF#Qqv(Rk0lAM7%x7Njt7CC)f}h~K z$Bs$o@BK~u!DJ%cl4!`n`qbwI->;wCLd*+h1WZe6KRtK%-`1hW%Y2!BWZ4a&gi$?sGPuetgw8Sf*;h z?XxWX;v}t|4V;!PjvE~l9gaM%CaJb>8OCt&WB73QrJ#wOUN}&b*PE)d9Y`Z&QUg>?-MS)IMAw}aDM0P zPls%~w8b1x21#$_aAQn0p4VhtQoc*%#>EX=_`LkK%l~IcubAOpcvMLva*^mko}LA2 zTpQAsM_RK+oHuaFE}M0eaaDSP;io3IvONb5F54#CW6*zu@uRF(bOC#o9y2f<$>^<( gS8GdTVqoH7aNjQEEY|+vJ*d$3boFyt=akR{0GM<+9{>OV delta 807 zcmV+?1K9kb48R50xWRWjs|8RnGD4CK&(z>d!7RESsKcs>%J ze0yEW85jiRAXrM5XnSEE4k0`2e_$S#Heg`T@PLS!CE)YC0Wd|WQ*1BH!^V-oxNC!m zrESLNc>`dIQitVX+))FIz0WTg7=HhNh_P}oFz^Dk{P}@Ucjo|tEu;V}9XRkgR}_eE z; zHUr{$Pz<7b2o%#GkHP>*4G5fCz`*eC0r4>h@)Rh>w7n4?on!~`JSYY^_%LHy$p*ns z+XSI!`7touJA$W_Mh9XVkYssq0>s1i1q=-G77(%T9~cMd+5>Ag2_An@BL9u8UfrxQf zK-|~?@iZ-fwihH>#x6m`I5;4H;#;aAo~BAYj17Q1g`77*d{EN;{e!lZ2*^`=I#Kzc zr2G9N#YQvXlzDjrl6*nQ7L+tWo`n@&px6h+IC7pv4=9jYa=_JXe~{!0O17Y+3Gyts z@VWwteNc=e=UJ41dJIuZL=3;cC^28%fOrVGfC43DP>h3;IVkV`!4cC>f$a+200_pO zmtW(w_u5uSX^UJyfs!&P#$y*l^6rmM*zG;LjDaC^3It=%%dcTAt;s-64$jh=7g|uk z@-4Qi3RiW8>DkM`eL_tS+S0;pFRTgz#V{=2VymifRcDxVrW#NaFA<54+urXVF&&NUd3^aFQw`i+MtE-t(s@XOHsV#NTnxQ{Hsbqm lbRKALFG}ZO1Ob2m0{|344!8~re<%O|002ovPDHLkV1h44Tc!X2 diff --git a/main/webapp/modules/core/images/header-background.png b/main/webapp/modules/core/images/header-background.png deleted file mode 100644 index 200ffa2cae28075e00db430ab31254bfee4d3e77..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23653 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 IM6N<$g4sE%9RL6T diff --git a/main/webapp/modules/core/images/menu-dropdown.png b/main/webapp/modules/core/images/menu-dropdown.png index 2a88bcce759a60198172fd22b3be9c9a653cbf92..f81b50990f2cd539c993431e760f600d826c212e 100644 GIT binary patch literal 1123 zcmaJ=TSyd97#`3EvD5@13xaWkC~)Vp>+ZONTWmACy3m;IE~rG{ICFG|b>>VnM|Twh zseBM3qFyR`$Ra4{^45id9;%0+D5MC|dazdLVxggk65APbwTHF?Gv_kj_x<1hpMS>M z+gd8hx0e$HQ4wpE;&`U;v$d=Qzq@GTJD#?oNGD3bUX)R6K!i2e1IU=6^no}~w4o!< zKr=y8-;yNDQ|n)#0=n)Tq6C$mXno1q^@`GHdjkj*tyetGWVSyT=Sgu0l{cMEx<lFo%(`;1RT}YEu=$}bQP5zIDkSFcKRm; z!&;X$owYLIf-zaeVmO+0Qz`&u`TtPESVuc34mSM$Q`kukS%8TH2M*XOzPR3cHlMwb7s@R@_2s$Zfkz&G6%8II+?tT?7%RLm~urlS>x~ag-0e1QYkTm?0{$gD?fa9F zd_I5e&aah~mHGMkefDH^_48*FD>E}Q%gf7ib91w^vkMCg)6>(rT<+`lrDRvnc1)~7 z@wNme{xyi#Q|HFD`^4$QfwAzLy2YAw()c#&ExX(_K3IJP zU60;R@n0fOuXP1PP%S>)aq7tX$*o5(P37q;=MTb(s>R&x_lHYsiHk3*8u+(n8MZ^j MB5l&Geci`?12%+>6951J delta 478 zcmV<40U`e52#^Gj83+ad003_Ao!pTjCw~F5Nkla8U!bE)p@T2bSFp5;I&^b#3P?#Nl_oX;6%u<+$RJj|*PBJ8 z2Tn+G^MB{hy;pOT#bN>7ZdU_$*iZn$4y(qh7CDN~hB~$A62@ zd_J${ayej(fk+sJ0mI?Y!_$j?zwZ;HR;#Jyav2hdgb<_MZWAYD9O0p%X_}hJWMDp@ zgJ_@zlF4MsG|dKH`jtvWEffmid7dz%TCGAlolf<7y#~GhO*WeanIQ8RSHvilN>Yqs zu^2MKbx;&V3bL$=%V4l4u{TC&vwy;DHj52%UH5=yWI0Zs_`Co6!Pq)}cFSjcy&BtR zgja+&zOIPKINPO|hzXvVP4}7To9|*`Q_*cR#YC1t#>8rI-g2?H8#B%_{rS~Qr_lw{Ez$_S!cuvfF6Wl_`Wa2h;%L)d6)fQMY{( zJaZG%Q-e|yQz{EjrrH1%*?PJ-hE&{2s`~Zi<^TWxXG$Dk&_816N!HNU}r5pbMu`?lo7!XXrIZaXqf+hRzef2!g`{}2R`n}cVYs&zD)!H_0igQW4 zxy5<$y|IRWh+~acJG{kud`MynDjw@nSPRHLZBpVLJ$z5g0L)8%yTd!qj^VOECK*Of zgGjIeC~u_^aR-#cF5UM-Q~LVmtpt6~ly(aaaw3cN{q5tJwvOv<_jurzJZb9=ET@JL z2q-5o4GzM@NKI*^YlwU1RwOur@PR3vCDm~n&|)!#1sUaCw29!RDy#ZNu~@tXHKZa1 zX^N`l)uN$m210QBNFrM7^^7LA$FYQEN`1~FLs5pqp*+-O7Vj%+sZ`1|G%YU>`Q#|% zB+ZA(`a}WK#Et!k`z(Z+BI&Y2Zb~B4vl4=6DjO!_Hi?EQDTx$SMp;P{pyT`>8U#~x z!khFw-+u}x?W2e)O`5R7*cF58t!JSk!-^^4EN(M)FzI5W&p1o^EP__603G7`VP=o; zj$_oqgp<&vHEc>kLH2#mz-qNnLAGw$wyvt!E|rS6v9)R80&X;ryqo8jyLPA-{8|LbYEE4Yq-)*KX&&P v=5klxotyxoqQ@^*F6EvrJvd$5UCDt9Ik3RN&0pWHBmxg=)jEE8ckjs`JSZvS literal 211 zcmeAS@N?(olHy`uVBq!ia0vp^AT}EZ8<70 Permalink - +
Starting up...
@@ -38,7 +38,7 @@
- Extensions: Customize... + Extensions:
diff --git a/main/webapp/modules/core/scripts/index.js b/main/webapp/modules/core/scripts/index.js index b43e76947..217d0d956 100644 --- a/main/webapp/modules/core/scripts/index.js +++ b/main/webapp/modules/core/scripts/index.js @@ -121,6 +121,7 @@ function renderProjects(data) { var renameLink = $('') .text("rename") + .addClass("secondary") .attr("href", "javascript:{}") .css("visibility", "hidden") .click(function() { diff --git a/main/webapp/modules/core/scripts/project.js b/main/webapp/modules/core/scripts/project.js index c494fea57..2ccc9425d 100644 --- a/main/webapp/modules/core/scripts/project.js +++ b/main/webapp/modules/core/scripts/project.js @@ -60,7 +60,6 @@ function resizeTabs() { function resizeAll() { resize(); resizeTabs(); - ui.extensionBar.resize(); ui.browsingEngine.resize(); ui.processWidget.resize(); diff --git a/main/webapp/modules/core/scripts/project/browsing-engine.js b/main/webapp/modules/core/scripts/project/browsing-engine.js index f509d02f0..5745b0a49 100644 --- a/main/webapp/modules/core/scripts/project/browsing-engine.js +++ b/main/webapp/modules/core/scripts/project/browsing-engine.js @@ -63,9 +63,9 @@ BrowsingEngine.prototype._initializeUI = function() { this._div.html( '
' + - '

Explore data ...

' + - '

by choosing a facet or filter method from the menus at the top of each column.

' + - '

Not sure how to get started? Watch these screencasts.

' + + '

Using facets and filters

' + + '

Use facets and filters to select subsets of your data to act on. Choose facet and filter methods from the menus at the top of each data column.

' + + '

Not sure how to get started?
Watch these screencasts!.

' + '
' + '
' + '
' + diff --git a/main/webapp/modules/core/scripts/project/extension-bar.js b/main/webapp/modules/core/scripts/project/extension-bar.js index c9fd271a2..d636605ba 100644 --- a/main/webapp/modules/core/scripts/project/extension-bar.js +++ b/main/webapp/modules/core/scripts/project/extension-bar.js @@ -37,7 +37,7 @@ ExtensionBar.prototype._initializeUI = function() { ExtensionBar.prototype._createMenuButton = function(label, submenu) { var self = this; - var menuItem = $("").addClass("button").text(label); + var menuItem = $("").addClass("button").append('' + label + ''); menuItem.click(function(evt) { MenuSystem.createAndShowStandardMenu( diff --git a/main/webapp/modules/core/scripts/views/data-table/cell-ui.js b/main/webapp/modules/core/scripts/views/data-table/cell-ui.js index ea059a6da..3f8541dc8 100644 --- a/main/webapp/modules/core/scripts/views/data-table/cell-ui.js +++ b/main/webapp/modules/core/scripts/views/data-table/cell-ui.js @@ -17,7 +17,7 @@ DataTableCellUI.prototype._render = function() { var editLink = $(' ') .addClass("data-table-cell-edit") - .attr("title", "edit this cell") + .attr("title", "Edit this cell") .appendTo(divContent) .click(function() { self._startEdit(this); }); diff --git a/main/webapp/modules/core/scripts/widgets/history-widget.js b/main/webapp/modules/core/scripts/widgets/history-widget.js index 19a41e57f..42dcee371 100644 --- a/main/webapp/modules/core/scripts/widgets/history-widget.js +++ b/main/webapp/modules/core/scripts/widgets/history-widget.js @@ -37,9 +37,9 @@ HistoryWidget.prototype._render = function() { .unbind() .html( '
' + - '

Don\'t worry ...

' + - '

about making mistakes. Every change you make will be shown here, and you can undo changes at any point.

' + - '

Learn more »

' + + '

Infinite undo history

' + + '

Don\'t worry about making mistakes. Every change you make will be shown here, and you can undo your changes anytime.

' + + '

Learn more »

' + '
' + '
' + '
' + @@ -84,6 +84,7 @@ HistoryWidget.prototype._render = function() { elmts.helpDiv.hide(); } else { elmts.bodyDiv.hide(); + elmts.footerDiv.hide(); } elmts.extractLink.click(function() { self._extractOperations(); }); diff --git a/main/webapp/modules/core/styles/common.less b/main/webapp/modules/core/styles/common.less index 4e777f55a..cb54f51be 100644 --- a/main/webapp/modules/core/styles/common.less +++ b/main/webapp/modules/core/styles/common.less @@ -94,20 +94,29 @@ a img { padding: 1px 15px; } -.button-disabled { +.button-disabled, a.button-disabled { color: #666; border: 1px solid #ddd; background: #f3f3f3; cursor: default; } -.button-disabled:hover { +.button-disabled:hover, a.button-disabled:hover { color: #666; border: 1px solid #ddd; background: #f3f3f3; cursor: default; } +.button img, a.button img { + padding-left: 3px; + } + +.button-menu, a.button-menu { + background: url(/images/down-arrow.png) no-repeat right 6px; + padding-right: 12px; + } + .form-table th, .form-table td { vertical-align: top; font-size: 1.3em; @@ -206,8 +215,6 @@ a img { margin: 0.4em; } - - input[type="checkbox"], input[type="radio"] { vertical-align: baseline; } @@ -282,10 +289,10 @@ div.grid-layout.layout-looser > table { border-spacing: 20px; } - div.input-container { padding: 3px; } + div.input-container > input, div.input-container > textarea { display: block; width: 100%; @@ -300,7 +307,6 @@ input.code, textarea.code { font-family: monospace; } - img { vertical-align: middle; } diff --git a/main/webapp/modules/core/styles/jquery-ui-overrides.less b/main/webapp/modules/core/styles/jquery-ui-overrides.less index 25b95dee9..31696f4dd 100644 --- a/main/webapp/modules/core/styles/jquery-ui-overrides.less +++ b/main/webapp/modules/core/styles/jquery-ui-overrides.less @@ -58,8 +58,12 @@ } .ui-tabs .ui-tabs-panel { - margin: 0px; - padding: 15px; + margin: 0; + padding: 0; border: 1px solid @chrome_primary; background: white; + } + +.ui-widget-content a { + color: @link_primary; } \ No newline at end of file diff --git a/main/webapp/modules/core/styles/project.less b/main/webapp/modules/core/styles/project.less index 3abe285be..055b7b236 100644 --- a/main/webapp/modules/core/styles/project.less +++ b/main/webapp/modules/core/styles/project.less @@ -77,7 +77,7 @@ #extension-bar { position: absolute; top: 0px; - right: @padding_normal; + right: @padding_loose; white-space: nowrap; font-size: 1.3em; padding: @padding_tight 0; @@ -88,18 +88,10 @@ } #view-panel { - background: white; - overflow: hidden; -} - -#left-panel .refine-tabs.ui-tabs .ui-tabs-panel { - border-bottom: none; - border-left: none; - border-right: none; - padding: @padding_loose; - overflow: hidden; -} + background: white; + overflow: hidden; + } #facet-panel, #history-panel { - overflow: auto; -} + overflow: auto; + } diff --git a/main/webapp/modules/core/styles/project/browsing.less b/main/webapp/modules/core/styles/project/facets.less similarity index 89% rename from main/webapp/modules/core/styles/project/browsing.less rename to main/webapp/modules/core/styles/project/facets.less index 6ae1bc3f4..2e85784b2 100644 --- a/main/webapp/modules/core/styles/project/browsing.less +++ b/main/webapp/modules/core/styles/project/facets.less @@ -1,48 +1,5 @@ @import-less url("../theme.less"); -.browsing-panel-header { - padding-bottom: 0.5em; - position: relative; - display: none; -} - -.browsing-panel-indicator { - visibility: hidden; - position: absolute; - width: 50%; - margin: 0px; - top: 0em; - left: 20%; - text-align: center; - background-color: #fff; - padding: 4px 4px; - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - border: 1px solid #ccc; -} -.browsing-panel-indicator img { - vertical-align: text-top; -} - -.browsing-panel-controls { - visibility: hidden; -} - -.browsing-panel-help { - margin-bottom: 1em; - padding: 10px; - background: white; - border: 1px solid #ccc; - -moz-border-radius: 10px; - -webkit-border-radius: 10px; -} -.browsing-panel-help h1 { - margin-top: 0px; - font-size: 150%; - font-weight: bold; - color: #888; -} - ul.facets-container { margin: 0; padding: 0; @@ -345,3 +302,5 @@ img.facet-choice-link { .scatterplot-selectors .scatterplot-dot-selector label.dot-big-label { background-position: -48px -25px; } + + diff --git a/main/webapp/modules/core/styles/widgets/history.less b/main/webapp/modules/core/styles/project/sidebar.less similarity index 61% rename from main/webapp/modules/core/styles/widgets/history.less rename to main/webapp/modules/core/styles/project/sidebar.less index 5bb703140..d6952f84c 100644 --- a/main/webapp/modules/core/styles/widgets/history.less +++ b/main/webapp/modules/core/styles/project/sidebar.less @@ -1,18 +1,54 @@ @import-less url("../theme.less"); -.history-panel-help { - padding: 10px; - background: white; - border: 1px solid #ccc; - -moz-border-radius: 10px; - -webkit-border-radius: 10px; -} -.history-panel-help h1 { - margin-top: 0px; - font-size: 150%; - font-weight: bold; - color: #888; -} +.browsing-panel-header { + padding-bottom: 0.5em; + position: relative; + display: none; + } + +.browsing-panel-indicator { + visibility: hidden; + position: absolute; + width: 50%; + margin: 0px; + top: 0em; + left: 20%; + text-align: center; + background-color: #fff; + padding: 4px 4px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border: 1px solid #ccc; + } + +.browsing-panel-indicator img { + vertical-align: text-top; + } + +.browsing-panel-controls { + visibility: hidden; + } + +.browsing-panel-help, .history-panel-help { + margin: 1em; + padding: 0 0 13px 0; + background: @fill_primary; + border: 1px solid @chrome_primary; + color: @near_black; + .rounded_corners(); + } + +.browsing-panel-help h1, .history-panel-help h1 { + margin: 10px; + padding: 20px 0 0 10px; + font-size: 1.15em; + font-weight: bold; + background: url(/images/logo-gem-40.png) no-repeat right top; + } + +.browsing-panel-help p, .history-panel-help p { + padding: 7px 20px; + } .history-panel-body { background: #fff; @@ -90,4 +126,4 @@ textarea.history-operation-json { white-space: pre; font-family: monospace; height: 400px; -} \ No newline at end of file +} diff --git a/main/webapp/modules/core/styles/views/data-table-view.less b/main/webapp/modules/core/styles/views/data-table-view.less index ea6ee6a4a..26fa256a6 100644 --- a/main/webapp/modules/core/styles/views/data-table-view.less +++ b/main/webapp/modules/core/styles/views/data-table-view.less @@ -36,6 +36,7 @@ table.data-table { margin: 0px; padding: 0px; + font-size: 1.1em; border-collapse: collapse; } @@ -84,6 +85,7 @@ table.column-header-layout td { padding: 0px; font-weight: bold; } + a.column-header-menu { display: block; margin-right: 5px; @@ -95,6 +97,7 @@ a.column-header-menu { } a.column-header-menu:hover { background-position: -17px 0px; + text-decoration: none; } .column-header-recon-stats-bar { margin-top: 5px; @@ -128,7 +131,7 @@ a.data-table-cell-edit { top: 0px; right: 0px; display: block; - width: 30px; + width: 25px; height: 16px; text-decoration: none; background-image: url(../../images/edit-map.png); @@ -137,7 +140,7 @@ a.data-table-cell-edit { visibility: hidden; } a.data-table-cell-edit:hover { - background-position: -30px 0px; + background-position: -25px 0px; } div.data-table-cell-content-numeric > a.data-table-cell-edit { left: 0px; @@ -145,7 +148,7 @@ div.data-table-cell-content-numeric > a.data-table-cell-edit { } .data-table-value-nonstring { - color: #880; + color: #282; } .data-table-error { color: red;