Download as
Browse Code »

Commit bf31eeb919f4805d15178cb2a0825476e2600c4b

Authored by Victor Costa
1 parent 8beecb60
Exists in theme-brasil-digital-from-staging and in 9 other branches angular_poc, api-article-archived, backup-7-jan-2016, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email, staging, staging_rails3

Fix merge with block-store

Showing 2 changed files with 1 additions and 141 deletions   Show diff stats
app/helpers/layout_helper.rb
  Diff comments   View file @bf31eeb
... ... @@ -50,6 +50,7 @@ module LayoutHelper
50 50 'inputosaurus',
51 51 'chat',
52 52 'selectordie-theme',
  53 + 'block-store',
53 54 pngfix_stylesheet_path,
54 55 ] + tokeninput_stylesheets
55 56 plugins_stylesheets = @plugins.select(&:stylesheet?).map { |plugin| plugin.class.public_path('style.css') }
... ...
public/stylesheets/block_store.css
View file @8beecb6
... ... @@ -1,141 +0,0 @@
1   -#content .block-type {
2   - padding: 0;
3   -}
4   -
5   -#block-types {
6   - height: 100px;
7   -}
8   -
9   -#block-types-container {
10   - margin: 0 60px;
11   -}
12   -
13   -.block-types-group {
14   - display: none;
15   - position: absolute;
16   - min-width: 800px;
17   -}
18   -
19   -#block-types-navigation a#next {
20   - float: right;
21   -}
22   -
23   -/*tirando a borda do colorbox se puder configurar para não ter me avise*/
24   -r,
25   -#cboxTopLeft,
26   -#cboxTopRight,
27   -#cboxMiddleLeft,
28   -#cboxContent,
29   -#cboxMiddleRight,
30   -#cboxBottomCenter,
31   -#cboxBottomLeft,
32   -#cboxBottomRight
33   - { background-image: none; }
34   -
35   -/*background do colorbox*/
36   -#cboxLoadedContent {
37   - background-color: #f5f5f5;
38   - border-radius: 20px;
39   -}
40   -
41   -#block-types .block-type {
42   - min-height: 92px;
43   - border: 0px solid #AAA;
44   - margin: 0px;
45   - padding: 0px;
46   - text-align: center;
47   - height: auto;
48   - float: none;
49   - display: inline-block;
50   - overflow: auto;
51   - width: 112px;
52   - cursor: move;
53   - vertical-align: top;
54   -}
55   -
56   -#block-types .block-type:hover {
57   - box-shadow: 0px 0px 0px 2px #FFF,
58   - 0px 0px 0px 2px #FFF,
59   - 0px 0px 10px rgba(0,0,0,0.6);
60   - outline: none;
61   -}
62   -
63   -#block-types .button-bar {
64   - margin: 0;
65   - display: none;
66   - position: absolute;
67   - right: 0%;
68   - border: 0px solid #AAA;
69   - margin: 0px;
70   - padding: 0px;
71   -}
72   -
73   -#block-types .block-type:hover .button-bar {
74   - display: inline;
75   -}
76   -
77   -#block-info-container {
78   - width: 770px;
79   - padding: 15px;
80   - color: #444;
81   -}
82   -
83   -#block-info-container #block-info-icon {
84   - float: left;
85   - padding-right: 10px;
86   -}
87   -
88   -#block-info-container #block-info-header {
89   - float: left;
90   -}
91   -
92   -#block-info-container #block-info-header .block-type-icon{
93   - float: left;
94   -}
95   -
96   -#block-info-container #block-info-header h1 {
97   - margin: 0;
98   - font-weight: normal;
99   - font-family: "Arial Black", Liberation Sans, Arial, sans-serif;
100   - margin-left: 5px;
101   - white-space: nowrap;
102   -}
103   -
104   -#block-info-container #block-info-header p{
105   - margin-left: 55px;
106   -}
107   -
108   -
109   -#block-info-container h2 {
110   - margin: 0;
111   - margin-top: 10px;
112   - font-weight: normal;
113   - font-family: "Arial Black", Liberation Sans, Arial, sans-serif;
114   -}
115   -
116   -#block-info-container p {
117   - margin: 0;
118   -}
119   -
120   -#block-info-images {
121   - clear: both;
122   - overflow-x: auto;
123   - padding-top: 15px;
124   -}
125   -
126   -#block-info-images ul{
127   - margin: 0px;
128   - padding: 0px;
129   -}
130   -#block-info-images li{
131   - list-style: none;
132   - display: inline;
133   -
134   -}
135   -
136   -
137   -#block-info-description {
138   - margin-top: 20px;
139   -}
140   -
141   -