[Git][noosfero/noosfero][master] 3 commits: Create a new css class .button-bar-boxes

[Gabriel Silva]

Gabriel Silva pushed to branch master at Noosfero / noosfero


Commits:
1d17a166 by Maxwell Borges Bezerra at 2018-03-13T17:17:52Z
Create a new css class .button-bar-boxes

this fix "send" button alignment for poll and query block while editting
side boxes

closes #304

- - - - -
7dee4b92 by Maxwell Borges Bezerra at 2018-03-20T16:59:26Z
changed image url references for signup screen.

the imagem url references, was referencing to a wrong directory images.

- - - - -
ab94c146 by Gabriel Silva at 2018-03-21T15:16:51Z
Merge branch 'fix-signup-balloon' into 'master'

Fix signup balloon

Closes #304

See merge request noosfero/noosfero!1419
- - - - -


3 changed files:

- app/helpers/boxes_helper.rb
- public/designs/themes/base/stylesheets/signup.scss
- public/stylesheets/blocks.scss


Changes:

=====================================
app/helpers/boxes_helper.rb
=====================================
--- a/app/helpers/boxes_helper.rb
+++ b/app/helpers/boxes_helper.rb
@@ -313,7 +313,7 @@ module BoxesHelper
       buttons << modal_inline_icon(:embed, _('Embed code'), {}, "#embed-code-box-#{block.id}") << html
     end
 
-    content_tag('div', buttons.join("\n").html_safe + tag('br', :style => 'clear: left'), :class => 'button-bar')
+    content_tag('div', buttons.join("\n").html_safe + tag('br', :style => 'clear: left'), :class => 'button-bar button-bar-boxes')
   end
 
   def current_blocks


=====================================
public/designs/themes/base/stylesheets/signup.scss
=====================================
--- a/public/designs/themes/base/stylesheets/signup.scss
+++ b/public/designs/themes/base/stylesheets/signup.scss
@@ -143,7 +143,7 @@
 
 #signup-form .invalid {
   border-color: #7f0000;
-  background-image: url(../images/passwords_nomatch.png);
+  background-image: url(/images/passwords_nomatch.png);
   box-shadow: 0 0 7px red;
 }
 
@@ -157,7 +157,7 @@
 
 #signup-form .checking {
   border-color: #4A4A4A;
-  background-image: url(../images/login_checking.png);
+  background-image: url(/images/login_checking.png);
 }
 
 #signup-form span.checking {
@@ -170,7 +170,7 @@
 
 #signup-form .validated {
   border-color: #005000;
-  background-image: url(../images/passwords_match.png);
+  background-image: url(/images/passwords_match.png);
 }
 
 #signup-form span.validated {
@@ -228,7 +228,7 @@
   padding: 5px 10px 45px 10px;
   margin: 0;
   line-height: 1.5em;
-  background: transparent url(../images/gray-balloon.png) bottom center no-repeat;
+  background: transparent url(/images/gray-balloon.png) bottom center no-repeat;
   position: absolute;
   z-index: 2;
   right: -150px;


=====================================
public/stylesheets/blocks.scss
=====================================
--- a/public/stylesheets/blocks.scss
+++ b/public/stylesheets/blocks.scss
@@ -110,7 +110,7 @@
   min-height: 20px;
 }
 
-#box-organizer .block .button-bar {
+#box-organizer .block .button-bar-boxes {
   cursor: move;
   position: absolute;
   display: block;
@@ -122,8 +122,8 @@
   display: none;
 }
 
-#box-organizer .block-outer:focus .button-bar,
-#box-organizer .block-outer:hover .button-bar {
+#box-organizer .block-outer:focus .button-bar-boxes,
+#box-organizer .block-outer:hover .button-bar-boxes {
   display: block;
 }
 



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/acf22012d001bab3638670d36df3c464e3aaa718...ab94c146246eb0a5d5985d5db93e69e385212e35

---
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/acf22012d001bab3638670d36df3c464e3aaa718...ab94c146246eb0a5d5985d5db93e69e385212e35
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20180321/34e92dc9/attachment-0001.html>