Skip to content

Commit 56b4bf2

Browse files
committed
Merge remote-tracking branch 'origin/develop'
2 parents 6eb08d5 + dc72bc9 commit 56b4bf2

File tree

15 files changed

+714
-2911
lines changed

15 files changed

+714
-2911
lines changed

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ root = true
44
[*]
55
end_of_line = crlf
66
insert_final_newline = true
7+
indent_size = 2
78

89
[*.{js,json}]
910
charset = utf-8
1011

1112
[{package.json,.travis.yml}]
1213
indent_style = space
13-
indent_size = 2

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,4 @@ node_modules
3939
.DS_Store
4040

4141
package-lock.json
42+
yarn.lock

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ ready(function() {
6767

6868
- [x] Vanilla javascript (no dependencies)
6969
- [x] Only appears when you use cookies
70+
- [x] Supported webpack
7071
- [ ] Add support language
7172
- [ ] Check AdBlocker
7273

@@ -80,7 +81,7 @@ npm install
8081

8182
#### Note
8283
- Browsers default don't support Cookies in local files!
83-
- Use webserver `$ gulp server`
84+
- Use webserver `$ gulp server`
8485

8586
# Contribute
8687

dist/cookiebar.css

Lines changed: 68 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,90 @@
11
/**
22
* cookiebar - It is a pure JS code, that warns the visitors in the notification bar, the page saves cookies. This is Compliant with the new EU cookie law.
3-
* Date 2017-08-08T12:26:15Z
4-
*
5-
* @author Tamás András Horváth <[email protected]> (http://icetee.hu)
6-
* @version v0.9.7
3+
* Date 2018-12-25T03:13:56Z
4+
*
5+
* @author Tamás András Horváth <[email protected]> (https://icetee.hu)
6+
* @version v1.0.0
77
* @link https://github.com/icetee/cookiebar#readme
88
* @license MIT
99
*/
1010

1111
.cookiebar {
12-
background-color: #2C3E50;
13-
bottom: 0;
14-
box-sizing: initial;
15-
color: #fff;
16-
min-height: 50px;
17-
left: 0;
18-
position: fixed;
19-
width: 100%;
12+
background-color: #2C3E50;
13+
bottom: 0;
14+
-webkit-box-sizing: initial;
15+
box-sizing: initial;
16+
color: #fff;
17+
min-height: 50px;
18+
left: 0;
19+
position: fixed;
20+
width: 100%;
21+
z-index: 9;
2022
}
23+
2124
.cookiebar-wrapper {
22-
height: 100%;
23-
overflow: hidden;
24-
padding: 14px;
25-
width: 85%;
25+
height: 100%;
26+
overflow: hidden;
27+
padding: 14px;
2628
}
29+
30+
.cookiebar-content {
31+
display: inline-block;
32+
width: 90%;
33+
vertical-align: middle;
34+
}
35+
36+
.cookiebar-actions {
37+
width: 10%;
38+
display: inline-block;
39+
vertical-align: middle;
40+
text-align: center;
41+
}
42+
2743
.cookiebar-desciption {
28-
display: inline;
29-
font-size: 1em;
44+
display: inline;
45+
font-size: 16px;
3046
}
47+
3148
.cookiebar-link {
32-
display: inline;
33-
padding-left: 5px;
49+
display: inline;
50+
padding-left: 5px;
3451
}
52+
3553
.cookiebar-link a {
36-
color: #3498db;
37-
text-decoration: none;
54+
color: #fff;
55+
text-decoration: none;
3856
}
57+
3958
.cookiebar-link a:hover {
40-
text-decoration: underline;
59+
text-decoration: underline;
60+
}
61+
62+
.cookiebar-button {
63+
display: inline-block;
64+
vertical-align: middle;
65+
width: auto;
4166
}
67+
4268
.cookiebar-btn {
43-
background: #e74c3c none repeat scroll 0 0;
44-
border: 0 none;
45-
color: #fff;
46-
cursor: pointer;
47-
font-size: 0.875em;
48-
height: 28px;
49-
padding: 0 10px 2px;
50-
position: absolute;
51-
right: 20px;
52-
text-transform: uppercase;
53-
margin: auto;
54-
top: 0;
55-
bottom: 0;
69+
background: #e74c3c none repeat scroll 0 0;
70+
border: 0 none;
71+
color: #fff;
72+
cursor: pointer;
73+
font-size: 14px;
74+
height: 28px;
75+
padding: 0 10px 2px;
76+
text-transform: uppercase;
77+
margin: auto;
5678
}
79+
5780
.cookiebar-btn:hover {
58-
background: #d34c37 none repeat scroll 0 0;
81+
background: #d34c37 none repeat scroll 0 0;
82+
}
83+
84+
@media screen and (max-width: 767px) {
85+
.cookiebar-actions {
86+
width: 100%;
87+
text-align: left;
88+
margin: 8px 0 0 0;
89+
}
5990
}

0 commit comments

Comments
 (0)