lalala 4.0.0.dev.84 → 4.0.0.dev.90

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 6a35402a70524029cb21b39fae4e713699a16024
4
- data.tar.gz: 723368d26f6e91a0be92764ce07bc7d8638721b7
3
+ metadata.gz: d2c265d0b510bf9f63a4490628305820b2e1eae4
4
+ data.tar.gz: c766e57c2bc3b3ec626f299f6dd49abb47a7301c
5
5
  SHA512:
6
- metadata.gz: 06fa7475140bac7c3f238682952cef18032a901c305e38d6d7b73d136b8c7ab33d0af7b8535140d677477c2e5bbf6de5ead20a1e748aa578d5f049b574710f85
7
- data.tar.gz: c5381f9b47bf4b38a3f97098b5d4b9aaec4062364c9f0da35a2f34b85b1ad0932547c95adc5dde0430cea86fc4cf8bf12706a67ac65a516e86f4ad85ef89985d
6
+ metadata.gz: e7b90abba2b1f16a0e5023215d0b33b2ee1559bf8831141c4cd16b1fb92f0fa0e0a58c56a83c56972949765c86bff1dfb813cfb70791cd680a109d028a0aa60d
7
+ data.tar.gz: 7bd7c867cbe5d490f09696bdd38e9046bb4da6fb166a23103e910cf588cc8a4875405bad0020cb7cd3c83227b567656de9efafd53d8a42f3e7ec8379d51d6d5e
@@ -49,16 +49,28 @@
49
49
  }
50
50
 
51
51
  &:last-child {
52
+
52
53
  > td {
53
54
  border: none;
54
55
  }
56
+
55
57
  }
58
+
59
+ &:hover {
60
+
61
+ & > td > .member_link {
62
+ display: inline-block;
63
+ }
64
+
65
+ }
66
+
56
67
  }
57
68
 
58
69
  // Columns
59
70
  th,
60
71
  td {
61
72
  border-bottom: 1px solid gray(224);
73
+ line-height: 16px;
62
74
  padding: 13px 15px 12px 15px;
63
75
 
64
76
  &.subtree {
@@ -84,14 +96,13 @@
84
96
  text-decoration: none;
85
97
 
86
98
  &.member_link {
87
- display: inline-block;
99
+ display: none; // Will be shown on <tr:hover>
88
100
  height: 16px;
89
101
  margin: 0 3px;
90
102
  text-indent: -9999px;
91
103
  width: 16px;
92
104
  }
93
105
 
94
-
95
106
  &.new_link {
96
107
  @include icon('add');
97
108
  }
@@ -19,11 +19,12 @@
19
19
  background-position: 0 10px;
20
20
 
21
21
  a {
22
+ background-position: left center;
22
23
  border-top: 1px solid gray(190);
23
24
  color: $black;
24
25
  display: block;
25
26
  line-height: 36px;
26
- margin: 0 0 0 30px;
27
+ padding: 0 0 0 30px;
27
28
  position: relative;
28
29
  text-decoration: none;
29
30
 
@@ -55,38 +56,15 @@
55
56
  font-weight: bold;
56
57
 
57
58
  &:after {
58
- content: ">";
59
+ content: "";
59
60
  }
60
61
 
61
62
  }
62
63
 
63
64
  }
64
65
 
65
- // Nav item has module name as ID
66
- &#dashboard {
67
- @include icon('application_view_tile');
68
- }
69
-
70
- &#admin_users {
71
- @include icon('user_gray');
72
- }
73
-
74
- &#pages {
75
- @include icon('page_white_text');
76
- }
77
-
78
- &#posts {
79
- @include icon('newspaper');
80
- }
81
-
82
- &#tags {
83
- @include icon('tag_purple');
84
- }
85
-
86
66
  }
87
67
 
88
-
89
-
90
68
  }
91
69
 
92
70
  }
@@ -3,7 +3,17 @@
3
3
  top: 125px;
4
4
  left: 25px;
5
5
 
6
- .current_user {
6
+ a {
7
+ @include text-shadow(1px 1px 2px #AAAAAA);
8
+ color: $white;
9
+ display: inline-block;
10
+ font-size: 15px;
11
+ font-weight: bold;
12
+ padding: 20px 0 0 10px;
13
+ text-decoration: none;
14
+ }
15
+
16
+ #current_user {
7
17
  @include border-radius(50%);
8
18
  background-image: image-url('lalala/users/default.jpg');
9
19
  background-size: cover;
@@ -30,14 +40,8 @@
30
40
 
31
41
  }
32
42
 
33
- a {
34
- @include text-shadow(1px 1px 2px #AAAAAA);
35
- color: $white;
36
- display: inline-block;
37
- font-size: 15px;
38
- font-weight: bold;
39
- padding: 20px 0 0 10px;
40
- text-decoration: none;
43
+ #logout {
44
+ float: left;
41
45
  }
42
46
 
43
47
  }
@@ -1,6 +1,6 @@
1
1
  module Lalala
2
2
  VERSION = "4.0.0"
3
- BUILD = "84"
3
+ BUILD = "90"
4
4
 
5
5
  if BUILD != ("{{BUILD_NUMBER" + "}}") # prevent sed replacement (see script/ci)
6
6
  BUILD_VERSION = "#{VERSION}.dev.#{BUILD}"
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: lalala
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.0.0.dev.84
4
+ version: 4.0.0.dev.90
5
5
  platform: ruby
6
6
  authors:
7
7
  - Simon Menke
@@ -13,7 +13,7 @@ authors:
13
13
  autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
- date: 2013-04-16 00:00:00.000000000 Z
16
+ date: 2013-04-19 00:00:00.000000000 Z
17
17
  dependencies:
18
18
  - !ruby/object:Gem::Dependency
19
19
  name: carrierwave