Skip to content

Commit

Permalink
Change BE themes to use local fonts, remove unused icons
Browse files Browse the repository at this point in the history
  • Loading branch information
instantflorian committed Oct 28, 2015
1 parent fc8fb1a commit 70ed738
Show file tree
Hide file tree
Showing 65 changed files with 9,667 additions and 38 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
wbce/templates/wbce/Thumbs.db
wbce/templates/wbce/Thumbs.db
*.db
Binary file modified wbce/admin/images/clock_16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified wbce/admin/images/clock_del_16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified wbce/admin/images/clock_red_16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified wbce/admin/images/delete_16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified wbce/admin/images/deleted_16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified wbce/admin/images/down_16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified wbce/admin/images/folder_16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified wbce/admin/images/hidden_16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified wbce/admin/images/keys_16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified wbce/admin/images/minus_16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified wbce/admin/images/modify_16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified wbce/admin/images/noclock_16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified wbce/admin/images/none_16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified wbce/admin/images/plus_16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified wbce/admin/images/private_16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified wbce/admin/images/reload_16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified wbce/admin/images/restore_16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified wbce/admin/images/up_16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified wbce/admin/images/view_16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified wbce/admin/images/visible_16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
53 changes: 52 additions & 1 deletion wbce/templates/advancedThemeWbFlat/browse.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,57 @@
/* CSS for upload-page: box with directories to browse mediafolders */

@font-face {
font-family: 'open_sans';
src:url('webfonts/fonts/opensans-bold-webfont.eot');
src:url('webfonts/fonts/opensans-bold-webfont.eot?#iefix') format('embedded-opentype'),
url('webfonts/fonts/opensans-bold-webfont.woff2') format('woff2'),
url('webfonts/fonts/opensans-bold-webfont.woff') format('woff'),
url('webfonts/fonts/opensans-bold-webfont.ttf') format('truetype'),
url('webfonts/fonts/opensans-bold-webfont.svg#open_sansbold') format('svg');
font-weight: bold;
font-style: normal;
}

@font-face {
font-family: 'open_sans';
src:url('webfonts/fonts/opensans-regular-webfont.eot');
src:url('webfonts/fonts/opensans-regular-webfont.eot?#iefix') format('embedded-opentype'),
url('webfonts/fonts/opensans-regular-webfont.woff2') format('woff2'),
url('webfonts/fonts/opensans-regular-webfont.woff') format('woff'),
url('webfonts/fonts/opensans-regular-webfont.ttf') format('truetype'),
url('webfonts/fonts/opensans-regular-webfont.svg#open_sansregular') format('svg');
font-weight: normal;
font-style: normal;
}


@font-face {
font-family: 'open_sans';
src:url('webfonts/fonts/opensans-bolditalic-webfont.eot');
src:url('webfonts/fonts/opensans-bolditalic-webfont.eot?#iefix') format('embedded-opentype'),
url('webfonts/fonts/opensans-bolditalic-webfont.woff2') format('woff2'),
url('webfonts/fonts/opensans-bolditalic-webfont.woff') format('woff'),
url('webfonts/fonts/opensans-bolditalic-webfont.ttf') format('truetype'),
url('webfonts/fonts/opensans-bolditalic-webfont.svg#open_sansbold_italic') format('svg');
font-weight: bold;
font-style: italic;
}

@font-face {
font-family: 'open_sans';
src:url('webfonts/fonts/opensans-italic-webfont.eot');
src:url('webfonts/fonts/opensans-italic-webfont.eot?#iefix') format('embedded-opentype'),
url('webfonts/fonts/opensans-italic-webfont.woff2') format('woff2'),
url('webfonts/fonts/opensans-italic-webfont.woff') format('woff'),
url('webfonts/fonts/opensans-italic-webfont.ttf') format('truetype'),
url('webfonts/fonts/opensans-italic-webfont.svg#open_sansitalic') format('svg');
font-weight: normal;
font-style: italic;

}

body, td, th, input, textarea {
font-family: "Open Sans", sans-serif;
font-family: open_sans, sans-serif;
font-size: 14px;
line-height: 24px;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,10 @@

<meta http-equiv="Content-Type" content="text/html; charset=<?php echo defined('DEFAULT_CHARSET') ? DEFAULT_CHARSET : 'utf-8';?>" />

<!-- Load Google Fonts -->
<link href='http://fonts.googleapis.com/css?family=Open+Sans:400,400italic,700,700italic' rel='stylesheet' type='text/css'>



<!-- Load FontAwesome -->
<link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" type="text/css" rel="stylesheet">
<link href="<?php echo THEME_URL; ?>/webfonts/fontawesome_include/font-awesome.4.2.0.min.css" type="text/css" rel="stylesheet">

<!-- prepare backend-css to include html -->
<link href="<?php echo THEME_URL;?>/theme.css" rel="stylesheet" type="text/css" media="screen" />
Expand Down
4 changes: 2 additions & 2 deletions wbce/templates/advancedThemeWbFlat/info.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
$template_directory = 'advancedThemeWbFlat';
$template_name = 'Advanced Theme WBCE Flat';
$template_function = 'theme';
$template_version = '0.4.0';
$template_platform = '2.8.3';
$template_version = '0.5';
$template_platform = '1.0.0';
$template_author = 'Yetiie';
$template_license = '<a href="http://www.gnu.org/licenses/gpl.html">GNU General Public License (GPLv3)</a>';
$template_license_terms = '-';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width" />
<meta name="author" content="Jorge Moreno. @alterebro" />
<meta name="description" content="NiceFileInput is a jQuery plugin which styles file input elements" />
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.0/jquery.min.js"></script>
<script src="/include/jquery/jquery-min.js"></script>
<script src="jquery.nicefileinput.min.js"></script>
<script>
/* <![CDATA[ */
Expand Down
8 changes: 3 additions & 5 deletions wbce/templates/advancedThemeWbFlat/templates/header.htt
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,16 @@
<meta http-equiv="content-type" content="text/html; charset={CHARSET}" />
<meta name="description" content="{TEXT_ADMINISTRATION}" />
<meta name="keywords" content="{TEXT_ADMINISTRATION}" />
<meta name="author" content="WebsiteBaker Org e.V." />
<meta name="author" content="WBCE" />
<meta http-equiv="Content-Encoding" content="gzip" />
<meta http-equiv="Accept-Encoding" content="gzip, deflate" />




<!-- Load Google Fonts -->
<link href='http://fonts.googleapis.com/css?family=Open+Sans:400,400italic,700,700italic' rel='stylesheet' type='text/css'>

<!-- Load FontAwesome(Script with Fallback-Solution at End off Page) -->
<link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" type="text/css" rel="stylesheet">
<link href="<?php echo THEME_URL; ?>/webfonts/fontawesome_include/font-awesome.4.2.0.min.css" type="text/css" rel="stylesheet">


<!-- include styles -->
Expand Down Expand Up @@ -60,7 +58,7 @@ var ADMIN_URL = '{ADMIN_URL}';


<!-- additional load jquery-ui -->
<script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/jquery-ui.min.js" type="text/javascript"></script>
<script src="{THEME_URL}/jquery_added/jq-ui/jquery-ui.v1.10.3.min.js" type="text/javascript"></script>
<script>window.jQuery.ui || document.write('<script src="{THEME_URL}/jquery_added/jq-ui/jquery-ui.v1.10.3.min.js" type="text/javascript"><\/script>')</script>


Expand Down
10 changes: 3 additions & 7 deletions wbce/templates/advancedThemeWbFlat/templates/login.htt
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,7 @@
<meta name="description" content="{TEXT_LOGIN}" />
<meta name="keywords" content="{TEXT_LOGIN}" />

<!-- Load Google Fonts -->
<link href='http://fonts.googleapis.com/css?family=Open+Sans:400,400italic,700,700italic' rel='stylesheet' type='text/css'>

<!-- Load FontAwesome(Script with Fallback-Solution at End off Page) -->
<link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" type="text/css" rel="stylesheet">
<link href="<?php echo THEME_URL; ?>/webfonts/fontawesome_include/font-awesome.4.2.0.min.css" type="text/css" rel="stylesheet">

<!-- include styles -->
<link href="{THEME_URL}/theme.css" rel="stylesheet" type="text/css" />
Expand All @@ -42,11 +38,11 @@

{MESSAGE}

<form name="login" class="login" action="{ACTION_URL}" method="post" autocomplete="off">
<form name="login" class="login" action="{ACTION_URL}" method="post">

<input type="hidden" name="url" value="{URL}" />
<input type="hidden" name="username_fieldname" value="{USERNAME_FIELDNAME}" />
<input type="hidden" name="password_fieldname" value="{PASSWORD_FIELDNAME}" autocomplete="off" />
<input type="hidden" name="password_fieldname" value="{PASSWORD_FIELDNAME}" />
<div id="page_login-fields">

<span class="page_login_fieldname">{TEXT_USERNAME}:</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,7 @@
<meta name="description" content="Retrieve Login Details" />
<meta name="keywords" content="Retrieve Login Details" />

<!-- Load Google Fonts -->
<link href='http://fonts.googleapis.com/css?family=Open+Sans:400,400italic,700,700italic' rel='stylesheet' type='text/css'>

<!-- Load FontAwesome(Script with Fallback-Solution at End off Page) -->
<link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" type="text/css" rel="stylesheet">
<link href="<?php echo THEME_URL; ?>/webfonts/fontawesome_include/font-awesome.4.2.0.min.css" type="text/css" rel="stylesheet">

<!-- include styles -->
<link href="{THEME_URL}/theme.css" rel="stylesheet" type="text/css" />
Expand Down
4 changes: 2 additions & 2 deletions wbce/templates/advancedThemeWbFlat/templates/warning.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<title>Maximum Invalid Login Attemps Exceeded</title>
<link href='http://fonts.googleapis.com/css?family=Open+Sans:400,400italic,700,700italic' rel='stylesheet' type='text/css'>
<link href="{THEME_URL}/theme.css" rel="stylesheet" type="text/css" />

<style type="text/css">
body {
font-family:"Open Sans",sans-serif;
font-family:open_sans,sans-serif;
}
#message {
text-align:center;
Expand Down
59 changes: 56 additions & 3 deletions wbce/templates/advancedThemeWbFlat/theme.css
Original file line number Diff line number Diff line change
@@ -1,11 +1,64 @@
@charset "UTF-8";

@font-face {
font-family: 'open_sans';
src:url('webfonts/fonts/opensans-bold-webfont.eot');
src:url('webfonts/fonts/opensans-bold-webfont.eot?#iefix') format('embedded-opentype'),
url('webfonts/fonts/opensans-bold-webfont.woff2') format('woff2'),
url('webfonts/fonts/opensans-bold-webfont.woff') format('woff'),
url('webfonts/fonts/opensans-bold-webfont.ttf') format('truetype'),
url('webfonts/fonts/opensans-bold-webfont.svg#open_sansbold') format('svg');
font-weight: bold;
font-style: normal;
}

@font-face {
font-family: 'open_sans';
src:url('webfonts/fonts/opensans-regular-webfont.eot');
src:url('webfonts/fonts/opensans-regular-webfont.eot?#iefix') format('embedded-opentype'),
url('webfonts/fonts/opensans-regular-webfont.woff2') format('woff2'),
url('webfonts/fonts/opensans-regular-webfont.woff') format('woff'),
url('webfonts/fonts/opensans-regular-webfont.ttf') format('truetype'),
url('webfonts/fonts/opensans-regular-webfont.svg#open_sansregular') format('svg');
font-weight: normal;
font-style: normal;
}


@font-face {
font-family: 'open_sans';
src:url('webfonts/fonts/opensans-bolditalic-webfont.eot');
src:url('webfonts/fonts/opensans-bolditalic-webfont.eot?#iefix') format('embedded-opentype'),
url('webfonts/fonts/opensans-bolditalic-webfont.woff2') format('woff2'),
url('webfonts/fonts/opensans-bolditalic-webfont.woff') format('woff'),
url('webfonts/fonts/opensans-bolditalic-webfont.ttf') format('truetype'),
url('webfonts/fonts/opensans-bolditalic-webfont.svg#open_sansbold_italic') format('svg');
font-weight: bold;
font-style: italic;
}

@font-face {
font-family: 'open_sans';
src:url('webfonts/fonts/opensans-italic-webfont.eot');
src:url('webfonts/fonts/opensans-italic-webfont.eot?#iefix') format('embedded-opentype'),
url('webfonts/fonts/opensans-italic-webfont.woff2') format('woff2'),
url('webfonts/fonts/opensans-italic-webfont.woff') format('woff'),
url('webfonts/fonts/opensans-italic-webfont.ttf') format('truetype'),
url('webfonts/fonts/opensans-italic-webfont.svg#open_sansitalic') format('svg');
font-weight: normal;
font-style: italic;

}


/* old theme as basis
* --> not alle elements get a new format
* --------------------------------------------------------------------------------- */
/* new theme starts from here
* --> overwrite old classes
* --------------------------------------------------------------------------------- */
/* ::reste:: general resets for unique starting-point */

/* ::reste:: general resets for unique starting-point */
html, body {
height: 100%;
/* html, body: height 100%; - nur so später height 100% für content möglich */
Expand Down Expand Up @@ -778,7 +831,7 @@ h1:first-child, h2:first-child, h3:first-child, h4:first-child, h5:first-child,
html {
font-size: 14px;
line-height: 24px;
font-family: "Open Sans", sans-serif;
font-family: open_sans, sans-serif;
color: #303641;
}

Expand Down Expand Up @@ -2155,7 +2208,7 @@ div.calendar,
div.calendar * {
-moz-box-sizing: content-box;
box-sizing: content-box;
font-family: "Open Sans", sans-serif;
font-family: open_sans, sans-serif;
}

/* ::individual-formatters-pages:: special settings for single pages */
Expand Down
Loading

0 comments on commit 70ed738

Please sign in to comment.