mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-01-17 04:38:27 +01:00
Code Issues Releases Wiki Activity

Increment bootstrap version. Fix for bbarea width.

Browse Source
This commit is contained in:
Cameron 2015-04-18 15:09:56 -07:00
parent 8890c523f0
commit d5388e7313
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
e107_core/sql/core_sql.php
View File

@ -577,7 +577,7 @@ CREATE TABLE userclass_classes (
CREATE TABLE user_extended (
user_extended_id int(10) unsigned NOT NULL default '0',
user_hidden_fields text NOT NULL,
user_hidden_fields text,
PRIMARY KEY (user_extended_id)
) ENGINE=MyISAM;
# --------------------------------------------------------

4
e107_themes/bootstrap3/theme.php
View File

@ -8,8 +8,8 @@ define("BOOTSTRAP", 3);
define("FONTAWESOME", 4);
define('VIEWPORT', "width=device-width, initial-scale=1.0");
e107::js("url", "http://netdna.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js");
e107::css('url', 'http://netdna.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css');
e107::js("url", "http://netdna.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js");
e107::css('url', 'http://netdna.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css');
e107::css('url', "http://netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css");
e107::js("footer-inline", "$('.e-tip').tooltip({container: 'body'})"); // activate bootstrap tooltips.

5
e107_web/css/e107.css
View File

@ -119,10 +119,13 @@ a.cpage-np.current { text-decoration: none; }
.image-preview {}
/* BBcode textareas */
div.bbarea.large, .tbox.large, .helpbox.large, .bbcode-panel { width: 95% !important; }
div.bbarea.large, .tbox.large, .helpbox.large { width: 95% }
div.bbarea.medium, .tbox.medium, .helpbox.medium { width: 60% !important; }
div.bbarea.small, .tbox.small, .helpbox.small { width: 250px !important; }
.bbcode-panel { width: 100% }
.input-block-level { width: 100% !important }
/******** bbcodes && typgoraphy */
p { }
p.bbcode { margin: 10px 0px; text-indent: 15px; } /* override if requried */