diff options
author | Thomas Citharel <tcit@tcit.fr> | 2016-10-03 23:08:26 +0200 |
---|---|---|
committer | Thomas Citharel <tcit@tcit.fr> | 2016-10-03 23:08:26 +0200 |
commit | a494c33ef7e574e68ab5bb83d0bdbd67348af0ef (patch) | |
tree | 2624d7677e4c0c72e0aba3411c02916322b1e3e2 /app/Resources | |
parent | a3cc0dd0bfedf8d77c232eb38e8781b3cf38a048 (diff) | |
download | wallabag-a494c33ef7e574e68ab5bb83d0bdbd67348af0ef.tar.gz wallabag-a494c33ef7e574e68ab5bb83d0bdbd67348af0ef.tar.zst wallabag-a494c33ef7e574e68ab5bb83d0bdbd67348af0ef.zip |
Basically, fix everything
* Remove install.sh
* Assets are now provided
* Icons font issues are fixed
Diffstat (limited to 'app/Resources')
-rw-r--r-- | app/Resources/static/themes/_global/img/icons/shaarli.png | bin | 0 -> 2143 bytes | |||
-rwxr-xr-x | app/Resources/static/themes/baggy/css/main.css | 35 | ||||
-rwxr-xr-x | app/Resources/static/themes/material/css/main.css | 54 | ||||
-rw-r--r-- | app/Resources/views/.gitkeep | 0 |
4 files changed, 83 insertions, 6 deletions
diff --git a/app/Resources/static/themes/_global/img/icons/shaarli.png b/app/Resources/static/themes/_global/img/icons/shaarli.png new file mode 100644 index 00000000..0e83c46e --- /dev/null +++ b/app/Resources/static/themes/_global/img/icons/shaarli.png | |||
Binary files differ | |||
diff --git a/app/Resources/static/themes/baggy/css/main.css b/app/Resources/static/themes/baggy/css/main.css index eeedd277..52186818 100755 --- a/app/Resources/static/themes/baggy/css/main.css +++ b/app/Resources/static/themes/baggy/css/main.css | |||
@@ -796,6 +796,15 @@ a.add-to-wallabag-link-after::after { | |||
796 | text-transform: none; | 796 | text-transform: none; |
797 | line-height: 1; | 797 | line-height: 1; |
798 | 798 | ||
799 | /* Enable Ligatures ================ */ | ||
800 | letter-spacing: 0; | ||
801 | -webkit-font-feature-settings: "liga"; | ||
802 | -moz-font-feature-settings: "liga=1"; | ||
803 | -moz-font-feature-settings: "liga"; | ||
804 | -ms-font-feature-settings: "liga" 1; | ||
805 | -o-font-feature-settings: "liga"; | ||
806 | font-feature-settings: "liga"; | ||
807 | |||
799 | /* Better Font Rendering =========== */ | 808 | /* Better Font Rendering =========== */ |
800 | -webkit-font-smoothing: antialiased; | 809 | -webkit-font-smoothing: antialiased; |
801 | -moz-osx-font-smoothing: grayscale; | 810 | -moz-osx-font-smoothing: grayscale; |
@@ -838,7 +847,7 @@ a.add-to-wallabag-link-after::after { | |||
838 | } | 847 | } |
839 | 848 | ||
840 | .icon-twitter::before { | 849 | .icon-twitter::before { |
841 | content: "\ea91"; | 850 | content: "\ea96"; |
842 | } | 851 | } |
843 | 852 | ||
844 | .icon-down-open::before { | 853 | .icon-down-open::before { |
@@ -877,13 +886,28 @@ a.add-to-wallabag-link-after::after { | |||
877 | content: "\e936"; | 886 | content: "\e936"; |
878 | } | 887 | } |
879 | 888 | ||
889 | .icon-eye::before { | ||
890 | content: "\e9ce"; | ||
891 | } | ||
892 | |||
893 | .icon-no-eye::before { | ||
894 | content: "\e9d1"; | ||
895 | } | ||
896 | |||
897 | .icon-calendar::before { | ||
898 | content: "\e953"; | ||
899 | } | ||
900 | |||
901 | .icon-time::before { | ||
902 | content: "\e952"; | ||
903 | } | ||
904 | |||
880 | /* .icon-image class, for image-based icons | 905 | /* .icon-image class, for image-based icons |
881 | ========================================================================== */ | 906 | ========================================================================== */ |
882 | 907 | ||
883 | .icon-image { | 908 | .icon-image { |
884 | background-size: 16px 16px; | 909 | background-size: 16px 16px; |
885 | background-repeat: no-repeat; | 910 | background: no-repeat center; |
886 | background-position: center; | ||
887 | padding-right: 1em !important; | 911 | padding-right: 1em !important; |
888 | padding-left: 1em !important; | 912 | padding-left: 1em !important; |
889 | } | 913 | } |
@@ -898,6 +922,11 @@ a.add-to-wallabag-link-after::after { | |||
898 | background-image: url("../../_global/img/icons/diaspora-icon--black.png"); | 922 | background-image: url("../../_global/img/icons/diaspora-icon--black.png"); |
899 | } | 923 | } |
900 | 924 | ||
925 | /* Diaspora */ | ||
926 | .icon-image--shaarli { | ||
927 | background-image: url("../../_global/img/icons/shaarli.png"); | ||
928 | } | ||
929 | |||
901 | /* ========================================================================== | 930 | /* ========================================================================== |
902 | Icon selected | 931 | Icon selected |
903 | ========================================================================== */ | 932 | ========================================================================== */ |
diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css index 397622bd..20d1dded 100755 --- a/app/Resources/static/themes/material/css/main.css +++ b/app/Resources/static/themes/material/css/main.css | |||
@@ -62,8 +62,8 @@ | |||
62 | font-feature-settings: 'liga'; | 62 | font-feature-settings: 'liga'; |
63 | } | 63 | } |
64 | 64 | ||
65 | [class^="icon-"], | 65 | [class^="icon-"]::before, |
66 | [class*=" icon-"] { | 66 | [class*=" icon-"]::before { |
67 | font-family: icomoon; | 67 | font-family: icomoon; |
68 | speak: none; | 68 | speak: none; |
69 | font-style: normal; | 69 | font-style: normal; |
@@ -72,11 +72,59 @@ | |||
72 | text-transform: none; | 72 | text-transform: none; |
73 | line-height: 1; | 73 | line-height: 1; |
74 | 74 | ||
75 | /* Enable Ligatures ================ */ | ||
76 | letter-spacing: 0; | ||
77 | -webkit-font-feature-settings: "liga"; | ||
78 | -moz-font-feature-settings: "liga=1"; | ||
79 | -moz-font-feature-settings: "liga"; | ||
80 | -ms-font-feature-settings: "liga" 1; | ||
81 | -o-font-feature-settings: "liga"; | ||
82 | font-feature-settings: "liga"; | ||
83 | |||
75 | /* Better Font Rendering =========== */ | 84 | /* Better Font Rendering =========== */ |
76 | -webkit-font-smoothing: antialiased; | 85 | -webkit-font-smoothing: antialiased; |
77 | -moz-osx-font-smoothing: grayscale; | 86 | -moz-osx-font-smoothing: grayscale; |
78 | } | 87 | } |
79 | 88 | ||
89 | .icon-image { | ||
90 | background-size: 16px 16px; | ||
91 | background: no-repeat center; | ||
92 | padding-right: 1em !important; | ||
93 | padding-left: 1em !important; | ||
94 | } | ||
95 | |||
96 | .icon-eye::before { | ||
97 | content: "\e9ce"; | ||
98 | } | ||
99 | |||
100 | .icon-no-eye::before { | ||
101 | content: "\e9d1"; | ||
102 | } | ||
103 | |||
104 | .icon-calendar::before { | ||
105 | content: "\e953"; | ||
106 | } | ||
107 | |||
108 | .icon-time::before { | ||
109 | content: "\e952"; | ||
110 | } | ||
111 | |||
112 | /* Carrot (http://carrot.org) */ | ||
113 | .icon-image--carrot { | ||
114 | background-image: url("../../_global/img/icons/carrot-icon--black.png"); | ||
115 | } | ||
116 | |||
117 | /* Diaspora */ | ||
118 | .icon-image--diaspora { | ||
119 | background-image: url("../../_global/img/icons/diaspora-icon--black.png"); | ||
120 | } | ||
121 | |||
122 | /* Shaarli */ | ||
123 | .icon-image--shaarli { | ||
124 | background-image: url("../../_global/img/icons/shaarli.png"); | ||
125 | } | ||
126 | |||
127 | |||
80 | body { | 128 | body { |
81 | display: flex; | 129 | display: flex; |
82 | min-height: 100vh; | 130 | min-height: 100vh; |
@@ -643,7 +691,7 @@ main ul.row { | |||
643 | } | 691 | } |
644 | 692 | ||
645 | .icon-twitter::before { | 693 | .icon-twitter::before { |
646 | content: "\ea91"; | 694 | content: "\ea96"; |
647 | } | 695 | } |
648 | 696 | ||
649 | .icon-apple::before { | 697 | .icon-apple::before { |
diff --git a/app/Resources/views/.gitkeep b/app/Resources/views/.gitkeep deleted file mode 100644 index e69de29b..00000000 --- a/app/Resources/views/.gitkeep +++ /dev/null | |||