aboutsummaryrefslogtreecommitdiffhomepage
path: root/themes
diff options
context:
space:
mode:
authorMaryana Rozhankivska <mariroz@mr.lviv.ua>2014-02-20 11:42:18 +0200
committerMaryana Rozhankivska <mariroz@mr.lviv.ua>2014-02-20 11:42:18 +0200
commit6203ef8e51c8b2712e54a01a183f30d282926b0b (patch)
treee055f9cf96738f7b8a26caed4893951022527eed /themes
parente83cf5a7875d1387d79d1909050ff2eca9b4421a (diff)
parentd09a5674e915e79762931a3465461327fb5737ea (diff)
downloadwallabag-6203ef8e51c8b2712e54a01a183f30d282926b0b.tar.gz
wallabag-6203ef8e51c8b2712e54a01a183f30d282926b0b.tar.zst
wallabag-6203ef8e51c8b2712e54a01a183f30d282926b0b.zip
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'themes')
-rw-r--r--themes/baggy/_head.twig3
-rwxr-xr-xthemes/baggy/css/font.css6
-rwxr-xr-xthemes/baggy/css/messages.css8
-rw-r--r--themes/baggy/font/ptsans.woffbin0 -> 24816 bytes
4 files changed, 11 insertions, 6 deletions
diff --git a/themes/baggy/_head.twig b/themes/baggy/_head.twig
index 0079b228..206d5aae 100644
--- a/themes/baggy/_head.twig
+++ b/themes/baggy/_head.twig
@@ -2,7 +2,6 @@
2 <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ poche_url }}/themes/{{theme}}/img/apple-touch-icon-144x144-precomposed.png"> 2 <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ poche_url }}/themes/{{theme}}/img/apple-touch-icon-144x144-precomposed.png">
3 <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ poche_url }}/themes/{{theme}}/img/apple-touch-icon-72x72-precomposed.png"> 3 <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ poche_url }}/themes/{{theme}}/img/apple-touch-icon-72x72-precomposed.png">
4 <link rel="apple-touch-icon-precomposed" href="{{ poche_url }}/themes/{{theme}}/img/apple-touch-icon-precomposed.png"> 4 <link rel="apple-touch-icon-precomposed" href="{{ poche_url }}/themes/{{theme}}/img/apple-touch-icon-precomposed.png">
5 <link href='http://fonts.googleapis.com/css?family=PT+Sans:700' rel='stylesheet' type='text/css'>
6 <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/ratatouille.css" media="all"> 5 <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/ratatouille.css" media="all">
7 <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/font.css" media="all"> 6 <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/font.css" media="all">
8 <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/main.css" media="all"> 7 <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/main.css" media="all">
@@ -10,4 +9,4 @@
10 <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/print.css" media="print"> 9 <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/print.css" media="print">
11 <script src="{{ poche_url }}/themes/{{theme}}/js/jquery-2.0.3.min.js"></script> 10 <script src="{{ poche_url }}/themes/{{theme}}/js/jquery-2.0.3.min.js"></script>
12 <script src="{{ poche_url }}/themes/{{theme}}/js/init.js"></script> 11 <script src="{{ poche_url }}/themes/{{theme}}/js/init.js"></script>
13 <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/closeMessage.js"></script> \ No newline at end of file 12 <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/closeMessage.js"></script>
diff --git a/themes/baggy/css/font.css b/themes/baggy/css/font.css
index e69de29b..ec662158 100755
--- a/themes/baggy/css/font.css
+++ b/themes/baggy/css/font.css
@@ -0,0 +1,6 @@
1@font-face {
2 font-family: 'PT Sans';
3 font-style: normal;
4 font-weight: 700;
5 src: local('PT Sans Bold'), local('PTSans-Bold'), url(/themes/baggy/fonts/ptsans.woff) format('woff');
6}
diff --git a/themes/baggy/css/messages.css b/themes/baggy/css/messages.css
index 85a0dbc1..42da70b3 100755
--- a/themes/baggy/css/messages.css
+++ b/themes/baggy/css/messages.css
@@ -1,19 +1,19 @@
1.install .messages.error { 1.messages.error.install {
2 border: 1px solid #c42608; 2 border: 1px solid #c42608;
3 color: #c00 !important; 3 color: #c00 !important;
4 background: #fff0ef; 4 background: #fff0ef;
5 text-align: left; 5 text-align: left;
6} 6}
7 7
8.install .messages.notice { 8.messages.notice.install {
9 border: 1px solid #ebcd41; 9 border: 1px solid #ebcd41;
10 color: #000; 10 color: #000;
11 background: #fffcd3; 11 background: #fffcd3;
12 text-align: left; 12 text-align: left;
13} 13}
14 14
15.install .messages.success { 15.messages.success.install {
16 border: 1px solid #6dc70c; 16 border: 1px solid #6dc70c;
17 background: #e0fbcc; 17 background: #e0fbcc !important;
18 text-align: left; 18 text-align: left;
19} \ No newline at end of file 19} \ No newline at end of file
diff --git a/themes/baggy/font/ptsans.woff b/themes/baggy/font/ptsans.woff
new file mode 100644
index 00000000..cf7c62e1
--- /dev/null
+++ b/themes/baggy/font/ptsans.woff
Binary files differ