Browse Source

Fix for previous commit

Nicolas Petton 11 years ago
parent
commit
d2ded19c6e
3 changed files with 6 additions and 10 deletions
  1. 3 1
      css/helios.css
  2. 3 1
      css/helios.less
  3. 0 8
      js/Helios-KeyBindings.js

+ 3 - 1
css/helios.css

@@ -503,7 +503,9 @@ body[id="helios"] .key_helper {
   z-index: 2001;
   position: fixed;
   top: 120px;
-  left: 41.67%;
+  left: 50%;
+  width: 400px;
+  margin-left: -200px;
   background: rgba(243, 243, 243, 0.9);
   box-shadow: 0 0 6px #aaa;
   border: 1px solid #aaa;

+ 3 - 1
css/helios.less

@@ -575,7 +575,9 @@ body[id="helios"] {
 		z-index: 2001;
 		position: fixed;
 		top: 120px;
-		left: 41.67%;
+		left: 50%;
+		width: 400px;
+		margin-left: -200px;
 		background: rgba(243, 243, 243, 0.9);
 		box-shadow: 0 0 6px #aaa;
 		border: 1px solid #aaa;

+ 0 - 8
js/Helios-KeyBindings.js

@@ -1673,11 +1673,7 @@ $ctx1.sendIdx["class:"]=1;
 $2=_st($1)._with_((function(){
 return smalltalk.withContext(function($ctx2) {
 $3=_st(html)._strong();
-<<<<<<< Updated upstream
-_st($3)._class_("pull-right");
-=======
 _st($3)._class_("label");
->>>>>>> Stashed changes
 $ctx2.sendIdx["class:"]=2;
 $4=_st($3)._with_(_st(_st(aBinding)._shortcut())._asLowercase());
 $ctx2.sendIdx["with:"]=2;
@@ -1694,11 +1690,7 @@ return $6;
 $ctx1.sendIdx["with:"]=1;
 return self}, function($ctx1) {$ctx1.fill(self,"renderBindingActionFor:on:",{aBinding:aBinding,html:html},globals.HLKeyBinderHelperWidget)})},
 args: ["aBinding", "html"],
-<<<<<<< Updated upstream
-source: "renderBindingActionFor: aBinding on: html\x0a\x09html span class: 'command'; with: [\x0a\x09\x09html strong \x0a\x09\x09\x09class: 'pull-right'; \x0a\x09\x09\x09with: aBinding shortcut asLowercase.\x0a  \x09\x09html a \x0a        \x09class: 'action'; \x0a            with: aBinding displayLabel;\x0a  \x09\x09\x09onClick: [ self keyBinder applyBinding: aBinding ] ]",
-=======
 source: "renderBindingActionFor: aBinding on: html\x0a\x09html span class: 'command'; with: [\x0a\x09\x09html strong \x0a\x09\x09\x09class: 'label'; \x0a\x09\x09\x09with: aBinding shortcut asLowercase.\x0a  \x09\x09html a \x0a        \x09class: 'action'; \x0a            with: aBinding displayLabel;\x0a  \x09\x09\x09onClick: [ self keyBinder applyBinding: aBinding ] ]",
->>>>>>> Stashed changes
 messageSends: ["class:", "span", "with:", "strong", "asLowercase", "shortcut", "a", "displayLabel", "onClick:", "applyBinding:", "keyBinder"],
 referencedClasses: []
 }),