diff --git a/source/plg_system_t3/includes/core/less.php b/source/plg_system_t3/includes/core/less.php index e0366239b7..5b401f2e0d 100644 --- a/source/plg_system_t3/includes/core/less.php +++ b/source/plg_system_t3/includes/core/less.php @@ -41,10 +41,8 @@ public static function getInstance() function getCss($path) { - $app = JFactory::getApplication(); // get vars last-modified - $vars_lm = $app->getUserState('vars_last_modified', 0); - $vars_lm = $app->getUserState('vars_last_modified_rtl', 0); + $vars_lm = JFactory::getApplication()->getUserState('vars_last_modified', 0); // less file last-modified $filepath = JPATH_ROOT . '/' . $path; @@ -73,31 +71,37 @@ function getCss($path) function buildCss($path) { $app = JFactory::getApplication(); - // get vars last-modified - $vars_lm = $app->getUserState('vars_last_modified', 0); - $vars_lm = $app->getUserState('vars_last_modified_rtl', 0); $theme = $app->getUserState('vars_theme', ''); - // less file last-modified - $filepath = JPATH_ROOT . '/' . $path; - $less_lm = filemtime($filepath); - - $less_lm_rtl = 0; $is_rtl = ($app->getUserState('DIRECTION') == 'rtl'); + $filepath = JPATH_ROOT . '/' . $path; + $less_lm = is_file($filepath) ? filemtime($filepath) : 0; + $less_lm_rtl = 0; + if ($is_rtl) { $filepath_rtl = preg_replace('/\/less\/(themes\/)?/', '/less/rtl/', $filepath); - if (is_file($filepath_rtl)) + if (is_file($filepath_rtl)){ $less_lm_rtl = filemtime($filepath_rtl); + } } + + // get vars last-modified + $vars_lm = $app->getUserState('vars_last_modified', 0); // get css cached file $subdir = ($is_rtl ? 'rtl/' : '') . ($theme ? $theme . '/' : ''); $cssfile = T3_DEV_FOLDER . '/' . $subdir . str_replace('/', '.', $path) . '.css'; $cssurl = JURI::base(true) . '/' . $cssfile; $csspath = JPATH_ROOT . '/' . $cssfile; - if (is_file($csspath) && filemtime($csspath) > $less_lm && filemtime($csspath) > $less_lm_rtl && filemtime($csspath) > $vars_lm) { - return $cssurl; + if (is_file($csspath)){ + $css_lm = filemtime($csspath); + + if($css_lm > $less_lm && + $css_lm > $vars_lm && + $css_lm > $less_lm_rtl) { + return $cssurl; + } } // not cached, build & store it @@ -111,7 +115,7 @@ function buildCss($path) function compileCss($path, $topath = '') { $app = JFactory::getApplication(); - $tpl = $app->getTemplate(); + $tpl = T3_TEMPLATE; $theme = $app->getUserState('vars_theme'); $tofile = null; @@ -129,11 +133,10 @@ function compileCss($path, $topath = '') return; } - // Get file content + // get file content $content = JFile::read($realpath); // remove comments $content = preg_replace('!/\*[^*]*\*+([^/][^*]*\*+)*/!', '', $content); - // split into array, separated by the import $arr = preg_split('#^\s*@import\s+"([^"]*)"\s*;#im', $content, -1, PREG_SPLIT_DELIM_CAPTURE); @@ -147,7 +150,7 @@ function compileCss($path, $topath = '') } // variables & mixin - $vars = $this->getVars(); + $vars = $this->getVars(); $importdirs = array(); // compile chunk @@ -160,19 +163,18 @@ function compileCss($path, $topath = '') $url = T3Path::cleanPath(dirname($path) . '/' . $s); // ignore vars.less and variables.less if they are in template folder // cause there may have other css less file with the same name (eg. font awesome) + if(strpos($url, $tpl . '/less/vars.less') !== false || strpos($url, $tpl . '/less/variables.less') !== false || strpos($url, '/bootstrap/less/variables.less') !== false){ continue; } - + // process import file $importcontent = JFile::read(JPATH_ROOT . '/' . $url); - - // ignore variables.less | vars.less if(strpos($url, $tpl . '/less/') !== false){ - $importcontent = preg_replace('#^\s*@import\s+".*(variables|vars)\.less"\s*;#im', '', $importcontent); + $importcontent = preg_replace('#^\s*@import\s+".*(variables-custom|variables|vars)\.less"\s*;#im', '', $importcontent); } // remember this path when lookup for import @@ -190,12 +192,8 @@ function compileCss($path, $topath = '') } } - $importdirs[] = dirname($realpath); - $importdirs[] = T3_TEMPLATE_PATH . '/less/'; - $this->setImportDir($importdirs); - // convert to RTL if using RTL - if ($app->getUserState('DIRECTION') == 'rtl' && !preg_match('#rtl/#', $path)) { + if ($app->getUserState('DIRECTION') == 'rtl' && strpos($path, 'rtl/') === false) { // transform LTR to RTL T3::import('jacssjanus/ja.cssjanus'); $output = JACSSJanus::transform($output, true); @@ -206,15 +204,20 @@ function compileCss($path, $topath = '') foreach ($arr as $s) { if ($import) { $import = false; - if ($s == 'vars.less') + + if ($s == 'vars.less'){ continue; + } + // process import file $url = T3Path::cleanPath(dirname($path) . '/' . $s); $url = preg_replace('/\/less\/(themes\/)?/', '/less/rtl/', $url); - if (!is_file(JPATH_ROOT . '/' . $url)) + + if (!is_file(JPATH_ROOT . '/' . $url)){ continue; + } + $importcontent = JFile::read(JPATH_ROOT . '/' . $url); - $output .= "#less-file-path-rtl{content: \"$url\";}\n" . $importcontent . "\n\n"; } else { $import = true; @@ -238,6 +241,10 @@ function compileCss($path, $topath = '') } } } + + $importdirs[] = dirname($realpath); + $importdirs[] = T3_TEMPLATE_PATH . '/less/'; + $this->setImportDir($importdirs); $source = $vars . "\n/**** Content ****/\n" . $output; // compile less to css using lessphp @@ -260,7 +267,7 @@ function compileCss($path, $topath = '') } // remove the dupliate clearfix at the beggining if not bootstrap.css file - if (!preg_match('#bootstrap.less#', $path)) { + if (strpos($path, $tpl . '/less/bootstrap.less') === false) { $arr = preg_split('/[\r?\n]{2,}/', $output); // ignore first one, it's clearfix array_shift($arr); @@ -289,24 +296,29 @@ function getVars() public static function buildVars($theme = null, $dir = null) { $app = JFactory::getApplication(); - // get last modify from import files $path = T3_TEMPLATE_PATH . '/less/vars.less'; - $vars = JFile::read($path); - // get last-modified - preg_match_all('#^\s*@import\s+"([^"]*)"#im', $vars, $matches); - $vars = ''; + if(!is_file($path)){ + T3::error(JText::_('T3_MSG_LESS_NOT_VALID')); + exit; + } + // get last-modified $last_modified = filemtime($path); + $vars = JFile::read($path); + + preg_match_all('#^\s*@import\s+"([^"]*)"#im', $vars, $matches); if (count($matches[0])) { + + $vars = ''; foreach ($matches[1] as $url) { $path = T3Path::cleanPath(T3_TEMPLATE_PATH . '/less/' . $url); if (file_exists($path)) { - if ($last_modified < filemtime($path)) - $last_modified = filemtime($path); + $last_modified = max($last_modified, filemtime($path)); $vars .= JFile::read($path); } } } + // theme style if ($theme === null) { $tpl = $app->getTemplate(true); @@ -322,53 +334,34 @@ public static function buildVars($theme = null, $dir = null) $app->setUserState('DIRECTION', $dir); if ($theme) { - // add theme variables.less - $path = T3_TEMPLATE_PATH . '/less/themes/' . $theme . '/variables.less'; - if (is_file($path)) { - if ($last_modified < filemtime($path)) - $last_modified = filemtime($path); - - // append theme file into vars - $vars .= JFile::read($path); - } - - // add theme variables-custom.less - $path = T3_TEMPLATE_PATH . '/less/themes/' . $theme . '/variables-custom.less'; - if (is_file($path)) { - if ($last_modified < filemtime($path)) - $last_modified = filemtime($path); - - // append theme file into vars - $vars .= JFile::read($path); + // add theme variables.less and variables-custom.less + foreach (array('variables.less', 'variables-custom.less') as $file) { + $path = T3_TEMPLATE_PATH . '/less/themes/' . $theme . '/' . $file; + if (is_file($path)) { + $last_modified = max($last_modified, filemtime($path)); + $vars .= JFile::read($path); + } } } // RTL variables $rtl = ''; if ($dir == 'rtl') { - // add rtl variables.less - $path = T3_TEMPLATE_PATH . '/less/rtl/variables.less'; - if (is_file($path)) { - if ($last_modified < filemtime($path)) - $last_modified = filemtime($path); - // append rtl file into vars - $vars .= JFile::read($path); - } - - // add rtl theme variables.less - $path = T3_TEMPLATE_PATH . '/less/rtl/' . $theme . '/variables.less'; - if (is_file($path)) { - if ($last_modified < filemtime($path)) - $last_modified = filemtime($path); - // append theme file into vars - $vars .= JFile::read($path); + // add rtl variables.less and rtl theme variables.less + foreach (array('variables.less', $theme . '/variables.less') as $file) { + $path = T3_TEMPLATE_PATH . '/less/rtl/' . $file; + if (is_file($path)) { + $last_modified = max($last_modified, filemtime($path)); + // append rtl file into vars + $vars .= JFile::read($path); + } } $rtl = '_rtl'; } - if ($app->getUserState('vars_last_modified' . $rtl) != $last_modified . $theme) { - $app->setUserState('vars_last_modified' . $rtl, $last_modified . $theme); + if ($app->getUserState('vars_last_modified' . $rtl) != $last_modified . $theme . $rtl) { + $app->setUserState('vars_last_modified' . $rtl, $last_modified . $theme . $rtl); } else { return $app->getUserState('vars_content' . $rtl); } @@ -378,6 +371,7 @@ public static function buildVars($theme = null, $dir = null) T3::import('jacssjanus/ja.cssjanus'); $vars = JACSSJanus::transform($vars, true); } + $app->setUserState('vars_content' . $rtl, $vars); } @@ -408,6 +402,7 @@ public static function addStylesheet($lesspath) // get the less content $lessContent = JFile::read(JPATH_ROOT . '/' . $lesspath); $path = dirname($lesspath); + // parse less content if (preg_match_all('#^\s*@import\s+"([^"]*)"#im', $lessContent, $matches)) { foreach ($matches[1] as $url) { @@ -444,20 +439,20 @@ public static function addStylesheet($lesspath) public static function compileAll($theme = null) { - $less = new self; // compile all css files $files = array(); $lesspath = 'templates/' . T3_TEMPLATE . '/less/'; $csspath = 'templates/' . T3_TEMPLATE . '/css/'; - // get single files need to compile + // get files need to compile $lessFiles = JFolder::files(JPATH_ROOT . '/' . $lesspath, '.less'); $lessContent = ''; foreach ($lessFiles as $file) { $lessContent .= JFile::read(JPATH_ROOT . '/' . $lesspath . $file) . "\n"; - // get file imported in this list } + + // get files imported in this list if (preg_match_all('#^\s*@import\s+"([^"]*)"#im', $lessContent, $matches)) { foreach ($lessFiles as $f) { if (!in_array($f, $matches[1])) @@ -465,6 +460,7 @@ public static function compileAll($theme = null) } } + // build default if (!$theme || $theme == 'default') { self::buildVars('', 'ltr'); // compile default @@ -472,12 +468,13 @@ public static function compileAll($theme = null) $less->compileCss($lesspath . $file . '.less', $csspath . $file . '.css'); } } - // compile themes css + + // build themes if (!$theme) { // get themes $themes = JFolder::folders(JPATH_ROOT . '/' . $lesspath . '/themes'); } else { - $themes = $theme != 'default' ? (array) ($theme) : array(); + $themes = $theme != 'default' ? (array)($theme) : array(); } if (is_array($themes)) { @@ -491,9 +488,9 @@ public static function compileAll($theme = null) } // compile rtl css - self::buildVars('', 'rtl'); // compile default if (!$theme || $theme == 'default') { + self::buildVars('', 'rtl'); foreach ($files as $file) { $less->compileCss($lesspath . $file . '.less', $csspath . 'rtl/' . $file . '.css'); } diff --git a/source/plg_system_t3/includes/gfont/T3GFont.php b/source/plg_system_t3/includes/gfont/T3GFont.php new file mode 100644 index 0000000000..46176b1142 --- /dev/null +++ b/source/plg_system_t3/includes/gfont/T3GFont.php @@ -0,0 +1,191 @@ +input; + + $template = $input->getCmd('template'); + $fontname = $input->getCmd('fontname'); + + // Get gfont path + $fontpath = self::getFontPath($template); + // Get font data + if ($fontpath !== false) { + $data = @file_get_contents($fontpath); + // Check to update font + $idx = strpos($data, '#'); + if ($idx !== false) { + // Seperate time & json font list + $time = (int) substr($data, 0, $idx); + $data = substr($data, $idx + 1); + // Check if not update 3 days => update + if (time() - $time > 3 * 86400) { + // Get local font path + $fontpath = self::getFontPath($template, self::$gfontcache, true); + // Update font list + $status = self::updateFontList($fontpath); + // If success, re-get font list + if ($status) { + $data = @file_get_contents($fontpath); + $idx = strpos($data, '#'); + if ($idx !== false) { + $data = substr($data, $idx + 1); + } + } + } + } + + $result = ''; + + if($data){ + // Parse fonts information + $font = json_decode($data); + $items = $font->items; + // Find suitable font by fontname + foreach ($items as $item) { + if (strcasecmp($fontname, $item->family) == 0) { + $result = $item; + break; + } + } + } + + } else { + $result = ''; + } + + echo json_encode($result); + exit; + } + + + /** + * Get font list + * + * @return void + */ + function getFontList() + { + $input = JFactory::getApplication()->input; + + $template = $input->getCmd('template'); + $fontname = $input->getCmd('fontname'); + + // Get gfont path + $fontpath = self::getFontPath($template); + if ($fontpath !== false) { + // Get font list + $data = @file_get_contents($fontpath); + // Remove time before json data + $idx = strpos($data, '#'); + if ($idx !== false) { + $data = substr($data, $idx + 1); + } + // Parse data + $font = json_decode($data); + $items = $font->items; + $result = array(); + $pattern = '/^' . $fontname . '.*/i'; + // Find suitable font by fontname + foreach ($items as $item) { + if (preg_match($pattern, $item->family)) { + $result[] = $item->family; + } + } + } else { + $result = array(); + } + + echo json_encode($result); + exit; + } + + /** + * Get gfont path + * + * @param string $template Template name + * @param string $filename Filename include extension + * @param bool $local Indicate get local path or not + * + * @return mixed Gfont file path if found, otherwise FALSE + */ + function getFontPath($template, $filename = false) + { + if(!$filename){ + $filename = self::$gfontcache; + } + + // Check to sure that template is using new folder structure + // If etc folder exists, considered as template is using new folder structure + $filepath = JPATH_SITE . '/templates/' . $template . '/etc'; + if (@is_dir($filepath)) { + $filepath .= '/' . $filename; + } + + // Check file exists or not + if (@is_file($filepath)) { + return $filepath; + } + + // Check file in base + $filepath = T3_PATH . '/etc/' . $filename; + if (@is_file($filepath)) { + return $filepath; + } + + // Can not find google font file + return false; + } + + /** + * Update font list from google web font page + * + * @param string $path File path store font list + * + * @return bool TRUE if update success, otherwise FALSE + */ + function updateFontList($path) + { + $key = 'AIzaSyA6_mK8ERGaR4_dhK6tJVEdvJPQEdwULWg'; + $url = 'https://www.googleapis.com/webfonts/v1/webfonts?key=' . $key; + $content = @file_get_contents($url); + if (!empty($content)) { + $content = time() . '#' . $content; + $result = file_put_contents($path, $content); + return ($result !== false); + } + return false; + } +} \ No newline at end of file diff --git a/source/plg_system_t3/languages/en-GB.plg_system_t3.ini b/source/plg_system_t3/languages/en-GB.plg_system_t3.ini index 27db8f5ada..83ea246246 100644 --- a/source/plg_system_t3/languages/en-GB.plg_system_t3.ini +++ b/source/plg_system_t3/languages/en-GB.plg_system_t3.ini @@ -450,3 +450,4 @@ T3_MSG_WARNING ="Warning!" T3_MSG_FILE_NOT_WRITABLE ="File system Not writable. Please check again server file permission." T3_MSG_PACKAGE_DAMAGED ="The framework has not been installed correctly" T3_MSG_DEVFOLDER_NOT_WRITABLE ="Cannot create css cached file in development folder: %s" +T3_MSG_LESS_NOT_VALID ="Template Less structure was not compatible with T3 compiler" diff --git a/source/tpl_t3_blank/css/bootstrap.css b/source/tpl_t3_blank/css/bootstrap.css index 7b0448e2e7..1534643583 100644 --- a/source/tpl_t3_blank/css/bootstrap.css +++ b/source/tpl_t3_blank/css/bootstrap.css @@ -1684,8 +1684,8 @@ table th[class*="span"], @font-face { font-family: 'FontAwesome'; - src: url('../fonts/font-awesome/font/fontawesome-webfont.eot?v=3.1.0'); - src: url('../fonts/font-awesome/font/fontawesome-webfont.eot?#iefix&v=3.1.0') format('embedded-opentype'), url('../fonts/font-awesome/font/fontawesome-webfont.woff?v=3.1.0') format('woff'), url('../fonts/font-awesome/font/fontawesome-webfont.ttf?v=3.1.0') format('truetype'), url('../fonts/font-awesome/font/fontawesome-webfont.svg#fontawesomeregular?v=3.1.0') format('svg'); + src: url('../fonts/font-awesome/font/fontawesome-webfont.eot?v=3.2.1'); + src: url('../fonts/font-awesome/font/fontawesome-webfont.eot?#iefix&v=3.2.1') format('embedded-opentype'), url('../fonts/font-awesome/font/fontawesome-webfont.woff?v=3.2.1') format('woff'), url('../fonts/font-awesome/font/fontawesome-webfont.ttf?v=3.2.1') format('truetype'), url('../fonts/font-awesome/font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1') format('svg'); font-weight: normal; font-style: normal; } @@ -1709,30 +1709,33 @@ table th[class*="span"], font-size: 1.3333333333333em; } a [class^="icon-"], -a [class^="icon-"]:before, -a [class*=" icon-"], -a [class*=" icon-"]:before { +a [class*=" icon-"] { display: inline; } [class^="icon-"].icon-fixed-width, [class*=" icon-"].icon-fixed-width { display: inline-block; - width: 1.2857142857143em; - text-align: center; + width: 1.1428571428571em; + text-align: right; + padding-right: 0.28571428571429em; } [class^="icon-"].icon-fixed-width.icon-large, [class*=" icon-"].icon-fixed-width.icon-large { - width: 1.5714285714286em; + width: 1.4285714285714em; } -ul.icons-ul { - list-style-type: none; - text-indent: -0.71428571428571em; +.icons-ul { margin-left: 2.1428571428571em; + list-style-type: none; } -ul.icons-ul > li .icon-li { - width: 0.71428571428571em; - display: inline-block; +.icons-ul > li { + position: relative; +} +.icons-ul .icon-li { + position: absolute; + left: -2.1428571428571em; + width: 2.1428571428571em; text-align: center; + line-height: inherit; } [class^="icon-"].hide, [class*=" icon-"].hide { @@ -1902,6 +1905,10 @@ ul.icons-ul > li .icon-li { .btn.btn-large [class*=" icon-"].pull-right.icon-2x { margin-left: .2em; } +.nav-list [class^="icon-"], +.nav-list [class*=" icon-"] { + line-height: inherit; +} .icon-stack { position: relative; display: inline-block; @@ -1932,6 +1939,11 @@ ul.icons-ul > li .icon-li { -webkit-animation: spin 2s infinite linear; animation: spin 2s infinite linear; } +a .icon-stack, +a .icon-spin { + display: inline-block; + text-decoration: none; +} @-moz-keyframes spin { 0% { -moz-transform: rotate(0deg); @@ -2010,6 +2022,13 @@ ul.icons-ul > li .icon-li { -o-transform: scale(1,-1); transform: scale(1,-1); } +a .icon-rotate-90:before, +a .icon-rotate-180:before, +a .icon-rotate-270:before, +a .icon-flip-horizontal:before, +a .icon-flip-vertical:before { + display: inline-block; +} .icon-glass:before { content: "\f000"; } @@ -2019,7 +2038,7 @@ ul.icons-ul > li .icon-li { .icon-search:before { content: "\f002"; } -.icon-envelope:before { +.icon-envelope-alt:before { content: "\f003"; } .icon-heart:before { @@ -2058,12 +2077,14 @@ ul.icons-ul > li .icon-li { .icon-zoom-out:before { content: "\f010"; } +.icon-power-off:before, .icon-off:before { content: "\f011"; } .icon-signal:before { content: "\f012"; } +.icon-gear:before, .icon-cog:before { content: "\f013"; } @@ -2073,7 +2094,7 @@ ul.icons-ul > li .icon-li { .icon-home:before { content: "\f015"; } -.icon-file:before { +.icon-file-alt:before { content: "\f016"; } .icon-time:before { @@ -2097,8 +2118,8 @@ ul.icons-ul > li .icon-li { .icon-play-circle:before { content: "\f01d"; } -.icon-repeat:before, -.icon-rotate-right:before { +.icon-rotate-right:before, +.icon-repeat:before { content: "\f01e"; } .icon-refresh:before { @@ -2293,8 +2314,8 @@ ul.icons-ul > li .icon-li { .icon-arrow-down:before { content: "\f063"; } -.icon-share-alt:before, -.icon-mail-forward:before { +.icon-mail-forward:before, +.icon-share-alt:before { content: "\f064"; } .icon-resize-full:before { @@ -2387,16 +2408,17 @@ ul.icons-ul > li .icon-li { .icon-key:before { content: "\f084"; } +.icon-gears:before, .icon-cogs:before { content: "\f085"; } .icon-comments:before { content: "\f086"; } -.icon-thumbs-up:before { +.icon-thumbs-up-alt:before { content: "\f087"; } -.icon-thumbs-down:before { +.icon-thumbs-down-alt:before { content: "\f088"; } .icon-star-half:before { @@ -2435,6 +2457,7 @@ ul.icons-ul > li .icon-li { .icon-phone:before { content: "\f095"; } +.icon-unchecked:before, .icon-check-empty:before { content: "\f096"; } @@ -2534,6 +2557,7 @@ ul.icons-ul > li .icon-li { .icon-copy:before { content: "\f0c5"; } +.icon-paperclip:before, .icon-paper-clip:before { content: "\f0c6"; } @@ -2606,14 +2630,14 @@ ul.icons-ul > li .icon-li { .icon-sort-up:before { content: "\f0de"; } -.icon-envelope-alt:before { +.icon-envelope:before { content: "\f0e0"; } .icon-linkedin:before { content: "\f0e1"; } -.icon-undo:before, -.icon-rotate-left:before { +.icon-rotate-left:before, +.icon-undo:before { content: "\f0e2"; } .icon-legal:before { @@ -2670,7 +2694,7 @@ ul.icons-ul > li .icon-li { .icon-food:before { content: "\f0f5"; } -.icon-file-alt:before { +.icon-file-text-alt:before { content: "\f0f6"; } .icon-building:before { @@ -2748,10 +2772,13 @@ ul.icons-ul > li .icon-li { .icon-circle:before { content: "\f111"; } -.icon-reply:before, -.icon-mail-reply:before { +.icon-mail-reply:before, +.icon-reply:before { content: "\f112"; } +.icon-github-alt:before { + content: "\f113"; +} .icon-folder-close-alt:before { content: "\f114"; } @@ -2921,6 +2948,187 @@ ul.icons-ul > li .icon-li { .icon-share-sign:before { content: "\f14d"; } +.icon-compass:before { + content: "\f14e"; +} +.icon-collapse:before { + content: "\f150"; +} +.icon-collapse-top:before { + content: "\f151"; +} +.icon-expand:before { + content: "\f152"; +} +.icon-euro:before, +.icon-eur:before { + content: "\f153"; +} +.icon-gbp:before { + content: "\f154"; +} +.icon-dollar:before, +.icon-usd:before { + content: "\f155"; +} +.icon-rupee:before, +.icon-inr:before { + content: "\f156"; +} +.icon-yen:before, +.icon-jpy:before { + content: "\f157"; +} +.icon-renminbi:before, +.icon-cny:before { + content: "\f158"; +} +.icon-won:before, +.icon-krw:before { + content: "\f159"; +} +.icon-bitcoin:before, +.icon-btc:before { + content: "\f15a"; +} +.icon-file:before { + content: "\f15b"; +} +.icon-file-text:before { + content: "\f15c"; +} +.icon-sort-by-alphabet:before { + content: "\f15d"; +} +.icon-sort-by-alphabet-alt:before { + content: "\f15e"; +} +.icon-sort-by-attributes:before { + content: "\f160"; +} +.icon-sort-by-attributes-alt:before { + content: "\f161"; +} +.icon-sort-by-order:before { + content: "\f162"; +} +.icon-sort-by-order-alt:before { + content: "\f163"; +} +.icon-thumbs-up:before { + content: "\f164"; +} +.icon-thumbs-down:before { + content: "\f165"; +} +.icon-youtube-sign:before { + content: "\f166"; +} +.icon-youtube:before { + content: "\f167"; +} +.icon-xing:before { + content: "\f168"; +} +.icon-xing-sign:before { + content: "\f169"; +} +.icon-youtube-play:before { + content: "\f16a"; +} +.icon-dropbox:before { + content: "\f16b"; +} +.icon-stackexchange:before { + content: "\f16c"; +} +.icon-instagram:before { + content: "\f16d"; +} +.icon-flickr:before { + content: "\f16e"; +} +.icon-adn:before { + content: "\f170"; +} +.icon-bitbucket:before { + content: "\f171"; +} +.icon-bitbucket-sign:before { + content: "\f172"; +} +.icon-tumblr:before { + content: "\f173"; +} +.icon-tumblr-sign:before { + content: "\f174"; +} +.icon-long-arrow-down:before { + content: "\f175"; +} +.icon-long-arrow-up:before { + content: "\f176"; +} +.icon-long-arrow-left:before { + content: "\f177"; +} +.icon-long-arrow-right:before { + content: "\f178"; +} +.icon-apple:before { + content: "\f179"; +} +.icon-windows:before { + content: "\f17a"; +} +.icon-android:before { + content: "\f17b"; +} +.icon-linux:before { + content: "\f17c"; +} +.icon-dribbble:before { + content: "\f17d"; +} +.icon-skype:before { + content: "\f17e"; +} +.icon-foursquare:before { + content: "\f180"; +} +.icon-trello:before { + content: "\f181"; +} +.icon-female:before { + content: "\f182"; +} +.icon-male:before { + content: "\f183"; +} +.icon-gittip:before { + content: "\f184"; +} +.icon-sun:before { + content: "\f185"; +} +.icon-moon:before { + content: "\f186"; +} +.icon-archive:before { + content: "\f187"; +} +.icon-bug:before { + content: "\f188"; +} +.icon-vk:before { + content: "\f189"; +} +.icon-weibo:before { + content: "\f18a"; +} +.icon-renren:before { + content: "\f18b"; +} diff --git a/source/tpl_t3_blank/css/megamenu.css b/source/tpl_t3_blank/css/megamenu.css index eaacbb2f51..a59450914a 100644 --- a/source/tpl_t3_blank/css/megamenu.css +++ b/source/tpl_t3_blank/css/megamenu.css @@ -65,6 +65,7 @@ } .t3-megamenu .mega-group { *zoom: 1; + *zoom: 1; } .t3-megamenu .mega-group:before, .t3-megamenu .mega-group:after { diff --git a/source/tpl_t3_blank/css/rtl/bootstrap.css b/source/tpl_t3_blank/css/rtl/bootstrap.css index 1b57b96cfc..0ffd98bb8c 100644 --- a/source/tpl_t3_blank/css/rtl/bootstrap.css +++ b/source/tpl_t3_blank/css/rtl/bootstrap.css @@ -1684,8 +1684,8 @@ table th[class*="span"], @font-face { font-family: 'FontAwesome'; - src: url('../../fonts/font-awesome/font/fontawesome-webfont.eot?v=3.1.0'); - src: url('../../fonts/font-awesome/font/fontawesome-webfont.eot?#iefix&v=3.1.0') format('embedded-opentype'), url('../../fonts/font-awesome/font/fontawesome-webfont.woff?v=3.1.0') format('woff'), url('../../fonts/font-awesome/font/fontawesome-webfont.ttf?v=3.1.0') format('truetype'), url('../../fonts/font-awesome/font/fontawesome-webfont.svg#fontawesomeregular?v=3.1.0') format('svg'); + src: url('../../fonts/font-awesome/font/fontawesome-webfont.eot?v=3.2.1'); + src: url('../../fonts/font-awesome/font/fontawesome-webfont.eot?#iefix&v=3.2.1') format('embedded-opentype'), url('../../fonts/font-awesome/font/fontawesome-webfont.woff?v=3.2.1') format('woff'), url('../../fonts/font-awesome/font/fontawesome-webfont.ttf?v=3.2.1') format('truetype'), url('../../fonts/font-awesome/font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1') format('svg'); font-weight: normal; font-style: normal; } @@ -1709,30 +1709,33 @@ table th[class*="span"], font-size: 1.3333333333333em; } a [class^="icon-"], -a [class^="icon-"]:before, -a [class*=" icon-"], -a [class*=" icon-"]:before { +a [class*=" icon-"] { display: inline; } [class^="icon-"].icon-fixed-width, [class*=" icon-"].icon-fixed-width { display: inline-block; - width: 1.2857142857143em; - text-align: center; + width: 1.1428571428571em; + text-align: right; + padding-right: 0.28571428571429em; } [class^="icon-"].icon-fixed-width.icon-large, [class*=" icon-"].icon-fixed-width.icon-large { - width: 1.5714285714286em; + width: 1.4285714285714em; } -ul.icons-ul { - list-style-type: none; - text-indent: -0.71428571428571em; +.icons-ul { margin-left: 2.1428571428571em; + list-style-type: none; } -ul.icons-ul > li .icon-li { - width: 0.71428571428571em; - display: inline-block; +.icons-ul > li { + position: relative; +} +.icons-ul .icon-li { + position: absolute; + left: -2.1428571428571em; + width: 2.1428571428571em; text-align: center; + line-height: inherit; } [class^="icon-"].hide, [class*=" icon-"].hide { @@ -1902,6 +1905,10 @@ ul.icons-ul > li .icon-li { .btn.btn-large [class*=" icon-"].pull-right.icon-2x { margin-left: .2em; } +.nav-list [class^="icon-"], +.nav-list [class*=" icon-"] { + line-height: inherit; +} .icon-stack { position: relative; display: inline-block; @@ -1932,6 +1939,11 @@ ul.icons-ul > li .icon-li { -webkit-animation: spin 2s infinite linear; animation: spin 2s infinite linear; } +a .icon-stack, +a .icon-spin { + display: inline-block; + text-decoration: none; +} @-moz-keyframes spin { 0% { -moz-transform: rotate(0deg); @@ -2010,6 +2022,13 @@ ul.icons-ul > li .icon-li { -o-transform: scale(1,-1); transform: scale(1,-1); } +a .icon-rotate-90:before, +a .icon-rotate-180:before, +a .icon-rotate-270:before, +a .icon-flip-horizontal:before, +a .icon-flip-vertical:before { + display: inline-block; +} .icon-glass:before { content: "\f000"; } @@ -2019,7 +2038,7 @@ ul.icons-ul > li .icon-li { .icon-search:before { content: "\f002"; } -.icon-envelope:before { +.icon-envelope-alt:before { content: "\f003"; } .icon-heart:before { @@ -2058,12 +2077,14 @@ ul.icons-ul > li .icon-li { .icon-zoom-out:before { content: "\f010"; } +.icon-power-off:before, .icon-off:before { content: "\f011"; } .icon-signal:before { content: "\f012"; } +.icon-gear:before, .icon-cog:before { content: "\f013"; } @@ -2073,7 +2094,7 @@ ul.icons-ul > li .icon-li { .icon-home:before { content: "\f015"; } -.icon-file:before { +.icon-file-alt:before { content: "\f016"; } .icon-time:before { @@ -2097,8 +2118,8 @@ ul.icons-ul > li .icon-li { .icon-play-circle:before { content: "\f01d"; } -.icon-repeat:before, -.icon-rotate-right:before { +.icon-rotate-right:before, +.icon-repeat:before { content: "\f01e"; } .icon-refresh:before { @@ -2293,8 +2314,8 @@ ul.icons-ul > li .icon-li { .icon-arrow-down:before { content: "\f063"; } -.icon-share-alt:before, -.icon-mail-forward:before { +.icon-mail-forward:before, +.icon-share-alt:before { content: "\f064"; } .icon-resize-full:before { @@ -2387,16 +2408,17 @@ ul.icons-ul > li .icon-li { .icon-key:before { content: "\f084"; } +.icon-gears:before, .icon-cogs:before { content: "\f085"; } .icon-comments:before { content: "\f086"; } -.icon-thumbs-up:before { +.icon-thumbs-up-alt:before { content: "\f087"; } -.icon-thumbs-down:before { +.icon-thumbs-down-alt:before { content: "\f088"; } .icon-star-half:before { @@ -2435,6 +2457,7 @@ ul.icons-ul > li .icon-li { .icon-phone:before { content: "\f095"; } +.icon-unchecked:before, .icon-check-empty:before { content: "\f096"; } @@ -2534,6 +2557,7 @@ ul.icons-ul > li .icon-li { .icon-copy:before { content: "\f0c5"; } +.icon-paperclip:before, .icon-paper-clip:before { content: "\f0c6"; } @@ -2606,14 +2630,14 @@ ul.icons-ul > li .icon-li { .icon-sort-up:before { content: "\f0de"; } -.icon-envelope-alt:before { +.icon-envelope:before { content: "\f0e0"; } .icon-linkedin:before { content: "\f0e1"; } -.icon-undo:before, -.icon-rotate-left:before { +.icon-rotate-left:before, +.icon-undo:before { content: "\f0e2"; } .icon-legal:before { @@ -2670,7 +2694,7 @@ ul.icons-ul > li .icon-li { .icon-food:before { content: "\f0f5"; } -.icon-file-alt:before { +.icon-file-text-alt:before { content: "\f0f6"; } .icon-building:before { @@ -2748,10 +2772,13 @@ ul.icons-ul > li .icon-li { .icon-circle:before { content: "\f111"; } -.icon-reply:before, -.icon-mail-reply:before { +.icon-mail-reply:before, +.icon-reply:before { content: "\f112"; } +.icon-github-alt:before { + content: "\f113"; +} .icon-folder-close-alt:before { content: "\f114"; } @@ -2921,6 +2948,187 @@ ul.icons-ul > li .icon-li { .icon-share-sign:before { content: "\f14d"; } +.icon-compass:before { + content: "\f14e"; +} +.icon-collapse:before { + content: "\f150"; +} +.icon-collapse-top:before { + content: "\f151"; +} +.icon-expand:before { + content: "\f152"; +} +.icon-euro:before, +.icon-eur:before { + content: "\f153"; +} +.icon-gbp:before { + content: "\f154"; +} +.icon-dollar:before, +.icon-usd:before { + content: "\f155"; +} +.icon-rupee:before, +.icon-inr:before { + content: "\f156"; +} +.icon-yen:before, +.icon-jpy:before { + content: "\f157"; +} +.icon-renminbi:before, +.icon-cny:before { + content: "\f158"; +} +.icon-won:before, +.icon-krw:before { + content: "\f159"; +} +.icon-bitcoin:before, +.icon-btc:before { + content: "\f15a"; +} +.icon-file:before { + content: "\f15b"; +} +.icon-file-text:before { + content: "\f15c"; +} +.icon-sort-by-alphabet:before { + content: "\f15d"; +} +.icon-sort-by-alphabet-alt:before { + content: "\f15e"; +} +.icon-sort-by-attributes:before { + content: "\f160"; +} +.icon-sort-by-attributes-alt:before { + content: "\f161"; +} +.icon-sort-by-order:before { + content: "\f162"; +} +.icon-sort-by-order-alt:before { + content: "\f163"; +} +.icon-thumbs-up:before { + content: "\f164"; +} +.icon-thumbs-down:before { + content: "\f165"; +} +.icon-youtube-sign:before { + content: "\f166"; +} +.icon-youtube:before { + content: "\f167"; +} +.icon-xing:before { + content: "\f168"; +} +.icon-xing-sign:before { + content: "\f169"; +} +.icon-youtube-play:before { + content: "\f16a"; +} +.icon-dropbox:before { + content: "\f16b"; +} +.icon-stackexchange:before { + content: "\f16c"; +} +.icon-instagram:before { + content: "\f16d"; +} +.icon-flickr:before { + content: "\f16e"; +} +.icon-adn:before { + content: "\f170"; +} +.icon-bitbucket:before { + content: "\f171"; +} +.icon-bitbucket-sign:before { + content: "\f172"; +} +.icon-tumblr:before { + content: "\f173"; +} +.icon-tumblr-sign:before { + content: "\f174"; +} +.icon-long-arrow-down:before { + content: "\f175"; +} +.icon-long-arrow-up:before { + content: "\f176"; +} +.icon-long-arrow-left:before { + content: "\f177"; +} +.icon-long-arrow-right:before { + content: "\f178"; +} +.icon-apple:before { + content: "\f179"; +} +.icon-windows:before { + content: "\f17a"; +} +.icon-android:before { + content: "\f17b"; +} +.icon-linux:before { + content: "\f17c"; +} +.icon-dribbble:before { + content: "\f17d"; +} +.icon-skype:before { + content: "\f17e"; +} +.icon-foursquare:before { + content: "\f180"; +} +.icon-trello:before { + content: "\f181"; +} +.icon-female:before { + content: "\f182"; +} +.icon-male:before { + content: "\f183"; +} +.icon-gittip:before { + content: "\f184"; +} +.icon-sun:before { + content: "\f185"; +} +.icon-moon:before { + content: "\f186"; +} +.icon-archive:before { + content: "\f187"; +} +.icon-bug:before { + content: "\f188"; +} +.icon-vk:before { + content: "\f189"; +} +.icon-weibo:before { + content: "\f18a"; +} +.icon-renren:before { + content: "\f18b"; +} diff --git a/source/tpl_t3_blank/css/rtl/dark/bootstrap.css b/source/tpl_t3_blank/css/rtl/dark/bootstrap.css index ce5fe04428..80354019f5 100644 --- a/source/tpl_t3_blank/css/rtl/dark/bootstrap.css +++ b/source/tpl_t3_blank/css/rtl/dark/bootstrap.css @@ -1684,8 +1684,8 @@ table th[class*="span"], @font-face { font-family: 'FontAwesome'; - src: url('../../../fonts/font-awesome/font/fontawesome-webfont.eot?v=3.1.0'); - src: url('../../../fonts/font-awesome/font/fontawesome-webfont.eot?#iefix&v=3.1.0') format('embedded-opentype'), url('../../../fonts/font-awesome/font/fontawesome-webfont.woff?v=3.1.0') format('woff'), url('../../../fonts/font-awesome/font/fontawesome-webfont.ttf?v=3.1.0') format('truetype'), url('../../../fonts/font-awesome/font/fontawesome-webfont.svg#fontawesomeregular?v=3.1.0') format('svg'); + src: url('../../../fonts/font-awesome/font/fontawesome-webfont.eot?v=3.2.1'); + src: url('../../../fonts/font-awesome/font/fontawesome-webfont.eot?#iefix&v=3.2.1') format('embedded-opentype'), url('../../../fonts/font-awesome/font/fontawesome-webfont.woff?v=3.2.1') format('woff'), url('../../../fonts/font-awesome/font/fontawesome-webfont.ttf?v=3.2.1') format('truetype'), url('../../../fonts/font-awesome/font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1') format('svg'); font-weight: normal; font-style: normal; } @@ -1709,30 +1709,33 @@ table th[class*="span"], font-size: 1.3333333333333em; } a [class^="icon-"], -a [class^="icon-"]:before, -a [class*=" icon-"], -a [class*=" icon-"]:before { +a [class*=" icon-"] { display: inline; } [class^="icon-"].icon-fixed-width, [class*=" icon-"].icon-fixed-width { display: inline-block; - width: 1.2857142857143em; - text-align: center; + width: 1.1428571428571em; + text-align: right; + padding-right: 0.28571428571429em; } [class^="icon-"].icon-fixed-width.icon-large, [class*=" icon-"].icon-fixed-width.icon-large { - width: 1.5714285714286em; + width: 1.4285714285714em; } -ul.icons-ul { - list-style-type: none; - text-indent: -0.71428571428571em; +.icons-ul { margin-left: 2.1428571428571em; + list-style-type: none; } -ul.icons-ul > li .icon-li { - width: 0.71428571428571em; - display: inline-block; +.icons-ul > li { + position: relative; +} +.icons-ul .icon-li { + position: absolute; + left: -2.1428571428571em; + width: 2.1428571428571em; text-align: center; + line-height: inherit; } [class^="icon-"].hide, [class*=" icon-"].hide { @@ -1902,6 +1905,10 @@ ul.icons-ul > li .icon-li { .btn.btn-large [class*=" icon-"].pull-right.icon-2x { margin-left: .2em; } +.nav-list [class^="icon-"], +.nav-list [class*=" icon-"] { + line-height: inherit; +} .icon-stack { position: relative; display: inline-block; @@ -1932,6 +1939,11 @@ ul.icons-ul > li .icon-li { -webkit-animation: spin 2s infinite linear; animation: spin 2s infinite linear; } +a .icon-stack, +a .icon-spin { + display: inline-block; + text-decoration: none; +} @-moz-keyframes spin { 0% { -moz-transform: rotate(0deg); @@ -2010,6 +2022,13 @@ ul.icons-ul > li .icon-li { -o-transform: scale(1,-1); transform: scale(1,-1); } +a .icon-rotate-90:before, +a .icon-rotate-180:before, +a .icon-rotate-270:before, +a .icon-flip-horizontal:before, +a .icon-flip-vertical:before { + display: inline-block; +} .icon-glass:before { content: "\f000"; } @@ -2019,7 +2038,7 @@ ul.icons-ul > li .icon-li { .icon-search:before { content: "\f002"; } -.icon-envelope:before { +.icon-envelope-alt:before { content: "\f003"; } .icon-heart:before { @@ -2058,12 +2077,14 @@ ul.icons-ul > li .icon-li { .icon-zoom-out:before { content: "\f010"; } +.icon-power-off:before, .icon-off:before { content: "\f011"; } .icon-signal:before { content: "\f012"; } +.icon-gear:before, .icon-cog:before { content: "\f013"; } @@ -2073,7 +2094,7 @@ ul.icons-ul > li .icon-li { .icon-home:before { content: "\f015"; } -.icon-file:before { +.icon-file-alt:before { content: "\f016"; } .icon-time:before { @@ -2097,8 +2118,8 @@ ul.icons-ul > li .icon-li { .icon-play-circle:before { content: "\f01d"; } -.icon-repeat:before, -.icon-rotate-right:before { +.icon-rotate-right:before, +.icon-repeat:before { content: "\f01e"; } .icon-refresh:before { @@ -2293,8 +2314,8 @@ ul.icons-ul > li .icon-li { .icon-arrow-down:before { content: "\f063"; } -.icon-share-alt:before, -.icon-mail-forward:before { +.icon-mail-forward:before, +.icon-share-alt:before { content: "\f064"; } .icon-resize-full:before { @@ -2387,16 +2408,17 @@ ul.icons-ul > li .icon-li { .icon-key:before { content: "\f084"; } +.icon-gears:before, .icon-cogs:before { content: "\f085"; } .icon-comments:before { content: "\f086"; } -.icon-thumbs-up:before { +.icon-thumbs-up-alt:before { content: "\f087"; } -.icon-thumbs-down:before { +.icon-thumbs-down-alt:before { content: "\f088"; } .icon-star-half:before { @@ -2435,6 +2457,7 @@ ul.icons-ul > li .icon-li { .icon-phone:before { content: "\f095"; } +.icon-unchecked:before, .icon-check-empty:before { content: "\f096"; } @@ -2534,6 +2557,7 @@ ul.icons-ul > li .icon-li { .icon-copy:before { content: "\f0c5"; } +.icon-paperclip:before, .icon-paper-clip:before { content: "\f0c6"; } @@ -2606,14 +2630,14 @@ ul.icons-ul > li .icon-li { .icon-sort-up:before { content: "\f0de"; } -.icon-envelope-alt:before { +.icon-envelope:before { content: "\f0e0"; } .icon-linkedin:before { content: "\f0e1"; } -.icon-undo:before, -.icon-rotate-left:before { +.icon-rotate-left:before, +.icon-undo:before { content: "\f0e2"; } .icon-legal:before { @@ -2670,7 +2694,7 @@ ul.icons-ul > li .icon-li { .icon-food:before { content: "\f0f5"; } -.icon-file-alt:before { +.icon-file-text-alt:before { content: "\f0f6"; } .icon-building:before { @@ -2748,10 +2772,13 @@ ul.icons-ul > li .icon-li { .icon-circle:before { content: "\f111"; } -.icon-reply:before, -.icon-mail-reply:before { +.icon-mail-reply:before, +.icon-reply:before { content: "\f112"; } +.icon-github-alt:before { + content: "\f113"; +} .icon-folder-close-alt:before { content: "\f114"; } @@ -2921,6 +2948,187 @@ ul.icons-ul > li .icon-li { .icon-share-sign:before { content: "\f14d"; } +.icon-compass:before { + content: "\f14e"; +} +.icon-collapse:before { + content: "\f150"; +} +.icon-collapse-top:before { + content: "\f151"; +} +.icon-expand:before { + content: "\f152"; +} +.icon-euro:before, +.icon-eur:before { + content: "\f153"; +} +.icon-gbp:before { + content: "\f154"; +} +.icon-dollar:before, +.icon-usd:before { + content: "\f155"; +} +.icon-rupee:before, +.icon-inr:before { + content: "\f156"; +} +.icon-yen:before, +.icon-jpy:before { + content: "\f157"; +} +.icon-renminbi:before, +.icon-cny:before { + content: "\f158"; +} +.icon-won:before, +.icon-krw:before { + content: "\f159"; +} +.icon-bitcoin:before, +.icon-btc:before { + content: "\f15a"; +} +.icon-file:before { + content: "\f15b"; +} +.icon-file-text:before { + content: "\f15c"; +} +.icon-sort-by-alphabet:before { + content: "\f15d"; +} +.icon-sort-by-alphabet-alt:before { + content: "\f15e"; +} +.icon-sort-by-attributes:before { + content: "\f160"; +} +.icon-sort-by-attributes-alt:before { + content: "\f161"; +} +.icon-sort-by-order:before { + content: "\f162"; +} +.icon-sort-by-order-alt:before { + content: "\f163"; +} +.icon-thumbs-up:before { + content: "\f164"; +} +.icon-thumbs-down:before { + content: "\f165"; +} +.icon-youtube-sign:before { + content: "\f166"; +} +.icon-youtube:before { + content: "\f167"; +} +.icon-xing:before { + content: "\f168"; +} +.icon-xing-sign:before { + content: "\f169"; +} +.icon-youtube-play:before { + content: "\f16a"; +} +.icon-dropbox:before { + content: "\f16b"; +} +.icon-stackexchange:before { + content: "\f16c"; +} +.icon-instagram:before { + content: "\f16d"; +} +.icon-flickr:before { + content: "\f16e"; +} +.icon-adn:before { + content: "\f170"; +} +.icon-bitbucket:before { + content: "\f171"; +} +.icon-bitbucket-sign:before { + content: "\f172"; +} +.icon-tumblr:before { + content: "\f173"; +} +.icon-tumblr-sign:before { + content: "\f174"; +} +.icon-long-arrow-down:before { + content: "\f175"; +} +.icon-long-arrow-up:before { + content: "\f176"; +} +.icon-long-arrow-left:before { + content: "\f177"; +} +.icon-long-arrow-right:before { + content: "\f178"; +} +.icon-apple:before { + content: "\f179"; +} +.icon-windows:before { + content: "\f17a"; +} +.icon-android:before { + content: "\f17b"; +} +.icon-linux:before { + content: "\f17c"; +} +.icon-dribbble:before { + content: "\f17d"; +} +.icon-skype:before { + content: "\f17e"; +} +.icon-foursquare:before { + content: "\f180"; +} +.icon-trello:before { + content: "\f181"; +} +.icon-female:before { + content: "\f182"; +} +.icon-male:before { + content: "\f183"; +} +.icon-gittip:before { + content: "\f184"; +} +.icon-sun:before { + content: "\f185"; +} +.icon-moon:before { + content: "\f186"; +} +.icon-archive:before { + content: "\f187"; +} +.icon-bug:before { + content: "\f188"; +} +.icon-vk:before { + content: "\f189"; +} +.icon-weibo:before { + content: "\f18a"; +} +.icon-renren:before { + content: "\f18b"; +} diff --git a/source/tpl_t3_blank/css/rtl/dark/template-responsive.css b/source/tpl_t3_blank/css/rtl/dark/template-responsive.css index 0a12e5aaf3..61d65e611a 100644 --- a/source/tpl_t3_blank/css/rtl/dark/template-responsive.css +++ b/source/tpl_t3_blank/css/rtl/dark/template-responsive.css @@ -1150,9 +1150,9 @@ } } @media (max-width: 599px) { - article img[align=right], - .img_caption.left, article img[align=left], + .img_caption.left, + article img[align=right], .img_caption.right, .img-fulltext-left, .img-fulltext-right { diff --git a/source/tpl_t3_blank/css/rtl/dark/template.css b/source/tpl_t3_blank/css/rtl/dark/template.css index 4811033938..8c426d292d 100644 --- a/source/tpl_t3_blank/css/rtl/dark/template.css +++ b/source/tpl_t3_blank/css/rtl/dark/template.css @@ -1184,9 +1184,9 @@ input.invalid { .dropdown-submenu.pull-left > .dropdown-menu { right: -100%; margin-right: 10px; - -webkit-border-radius: 6px 6px 6px 6px; - -moz-border-radius: 6px 6px 6px 6px; - border-radius: 6px 6px 6px 6px; + -webkit-border-radius: 0 6px 6px 6px; + -moz-border-radius: 0 6px 6px 6px; + border-radius: 0 6px 6px 6px; } .dropdown .dropdown-menu .nav-header { padding-right: 20px; @@ -1675,12 +1675,12 @@ div.tagssimilar ul li a:active { font-size: 13px; margin-bottom: 20px; } -article img[align=right], +article img[align=left], .img_caption.left, .pull-left.item-image { margin: 0 40px 20px 0; } -article img[align=left], +article img[align=right], .img_caption.right, .pull-right.item-image { margin: 0 0 20px 40px; @@ -2303,17 +2303,17 @@ article aside .btn-group > .dropdown-toggle:focus { .input-prepend .chzn-container-single .chzn-single { border-color: #666; height: 26px; - -webkit-border-radius: 3px 3px; - -moz-border-radius: 3px 3px; - border-radius: 3px 3px; + -webkit-border-radius: 3px 0 0 3px; + -moz-border-radius: 3px 0 0 3px; + border-radius: 3px 0 0 3px; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; } .input-prepend .chzn-container-active .chzn-single-with-drop { - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; + -webkit-border-radius: 3px 0 0 0; + -moz-border-radius: 3px 0 0 0; + border-radius: 3px 0 0 0; } .input-prepend .chzn-container-single .chzn-drop { border-color: #666; diff --git a/source/tpl_t3_blank/css/rtl/green/bootstrap.css b/source/tpl_t3_blank/css/rtl/green/bootstrap.css index 2a07761a80..67dd83bd9f 100644 --- a/source/tpl_t3_blank/css/rtl/green/bootstrap.css +++ b/source/tpl_t3_blank/css/rtl/green/bootstrap.css @@ -1684,8 +1684,8 @@ table th[class*="span"], @font-face { font-family: 'FontAwesome'; - src: url('../../../fonts/font-awesome/font/fontawesome-webfont.eot?v=3.1.0'); - src: url('../../../fonts/font-awesome/font/fontawesome-webfont.eot?#iefix&v=3.1.0') format('embedded-opentype'), url('../../../fonts/font-awesome/font/fontawesome-webfont.woff?v=3.1.0') format('woff'), url('../../../fonts/font-awesome/font/fontawesome-webfont.ttf?v=3.1.0') format('truetype'), url('../../../fonts/font-awesome/font/fontawesome-webfont.svg#fontawesomeregular?v=3.1.0') format('svg'); + src: url('../../../fonts/font-awesome/font/fontawesome-webfont.eot?v=3.2.1'); + src: url('../../../fonts/font-awesome/font/fontawesome-webfont.eot?#iefix&v=3.2.1') format('embedded-opentype'), url('../../../fonts/font-awesome/font/fontawesome-webfont.woff?v=3.2.1') format('woff'), url('../../../fonts/font-awesome/font/fontawesome-webfont.ttf?v=3.2.1') format('truetype'), url('../../../fonts/font-awesome/font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1') format('svg'); font-weight: normal; font-style: normal; } @@ -1709,30 +1709,33 @@ table th[class*="span"], font-size: 1.3333333333333em; } a [class^="icon-"], -a [class^="icon-"]:before, -a [class*=" icon-"], -a [class*=" icon-"]:before { +a [class*=" icon-"] { display: inline; } [class^="icon-"].icon-fixed-width, [class*=" icon-"].icon-fixed-width { display: inline-block; - width: 1.2857142857143em; - text-align: center; + width: 1.1428571428571em; + text-align: right; + padding-right: 0.28571428571429em; } [class^="icon-"].icon-fixed-width.icon-large, [class*=" icon-"].icon-fixed-width.icon-large { - width: 1.5714285714286em; + width: 1.4285714285714em; } -ul.icons-ul { - list-style-type: none; - text-indent: -0.71428571428571em; +.icons-ul { margin-left: 2.1428571428571em; + list-style-type: none; } -ul.icons-ul > li .icon-li { - width: 0.71428571428571em; - display: inline-block; +.icons-ul > li { + position: relative; +} +.icons-ul .icon-li { + position: absolute; + left: -2.1428571428571em; + width: 2.1428571428571em; text-align: center; + line-height: inherit; } [class^="icon-"].hide, [class*=" icon-"].hide { @@ -1902,6 +1905,10 @@ ul.icons-ul > li .icon-li { .btn.btn-large [class*=" icon-"].pull-right.icon-2x { margin-left: .2em; } +.nav-list [class^="icon-"], +.nav-list [class*=" icon-"] { + line-height: inherit; +} .icon-stack { position: relative; display: inline-block; @@ -1932,6 +1939,11 @@ ul.icons-ul > li .icon-li { -webkit-animation: spin 2s infinite linear; animation: spin 2s infinite linear; } +a .icon-stack, +a .icon-spin { + display: inline-block; + text-decoration: none; +} @-moz-keyframes spin { 0% { -moz-transform: rotate(0deg); @@ -2010,6 +2022,13 @@ ul.icons-ul > li .icon-li { -o-transform: scale(1,-1); transform: scale(1,-1); } +a .icon-rotate-90:before, +a .icon-rotate-180:before, +a .icon-rotate-270:before, +a .icon-flip-horizontal:before, +a .icon-flip-vertical:before { + display: inline-block; +} .icon-glass:before { content: "\f000"; } @@ -2019,7 +2038,7 @@ ul.icons-ul > li .icon-li { .icon-search:before { content: "\f002"; } -.icon-envelope:before { +.icon-envelope-alt:before { content: "\f003"; } .icon-heart:before { @@ -2058,12 +2077,14 @@ ul.icons-ul > li .icon-li { .icon-zoom-out:before { content: "\f010"; } +.icon-power-off:before, .icon-off:before { content: "\f011"; } .icon-signal:before { content: "\f012"; } +.icon-gear:before, .icon-cog:before { content: "\f013"; } @@ -2073,7 +2094,7 @@ ul.icons-ul > li .icon-li { .icon-home:before { content: "\f015"; } -.icon-file:before { +.icon-file-alt:before { content: "\f016"; } .icon-time:before { @@ -2097,8 +2118,8 @@ ul.icons-ul > li .icon-li { .icon-play-circle:before { content: "\f01d"; } -.icon-repeat:before, -.icon-rotate-right:before { +.icon-rotate-right:before, +.icon-repeat:before { content: "\f01e"; } .icon-refresh:before { @@ -2293,8 +2314,8 @@ ul.icons-ul > li .icon-li { .icon-arrow-down:before { content: "\f063"; } -.icon-share-alt:before, -.icon-mail-forward:before { +.icon-mail-forward:before, +.icon-share-alt:before { content: "\f064"; } .icon-resize-full:before { @@ -2387,16 +2408,17 @@ ul.icons-ul > li .icon-li { .icon-key:before { content: "\f084"; } +.icon-gears:before, .icon-cogs:before { content: "\f085"; } .icon-comments:before { content: "\f086"; } -.icon-thumbs-up:before { +.icon-thumbs-up-alt:before { content: "\f087"; } -.icon-thumbs-down:before { +.icon-thumbs-down-alt:before { content: "\f088"; } .icon-star-half:before { @@ -2435,6 +2457,7 @@ ul.icons-ul > li .icon-li { .icon-phone:before { content: "\f095"; } +.icon-unchecked:before, .icon-check-empty:before { content: "\f096"; } @@ -2534,6 +2557,7 @@ ul.icons-ul > li .icon-li { .icon-copy:before { content: "\f0c5"; } +.icon-paperclip:before, .icon-paper-clip:before { content: "\f0c6"; } @@ -2606,14 +2630,14 @@ ul.icons-ul > li .icon-li { .icon-sort-up:before { content: "\f0de"; } -.icon-envelope-alt:before { +.icon-envelope:before { content: "\f0e0"; } .icon-linkedin:before { content: "\f0e1"; } -.icon-undo:before, -.icon-rotate-left:before { +.icon-rotate-left:before, +.icon-undo:before { content: "\f0e2"; } .icon-legal:before { @@ -2670,7 +2694,7 @@ ul.icons-ul > li .icon-li { .icon-food:before { content: "\f0f5"; } -.icon-file-alt:before { +.icon-file-text-alt:before { content: "\f0f6"; } .icon-building:before { @@ -2748,10 +2772,13 @@ ul.icons-ul > li .icon-li { .icon-circle:before { content: "\f111"; } -.icon-reply:before, -.icon-mail-reply:before { +.icon-mail-reply:before, +.icon-reply:before { content: "\f112"; } +.icon-github-alt:before { + content: "\f113"; +} .icon-folder-close-alt:before { content: "\f114"; } @@ -2921,6 +2948,187 @@ ul.icons-ul > li .icon-li { .icon-share-sign:before { content: "\f14d"; } +.icon-compass:before { + content: "\f14e"; +} +.icon-collapse:before { + content: "\f150"; +} +.icon-collapse-top:before { + content: "\f151"; +} +.icon-expand:before { + content: "\f152"; +} +.icon-euro:before, +.icon-eur:before { + content: "\f153"; +} +.icon-gbp:before { + content: "\f154"; +} +.icon-dollar:before, +.icon-usd:before { + content: "\f155"; +} +.icon-rupee:before, +.icon-inr:before { + content: "\f156"; +} +.icon-yen:before, +.icon-jpy:before { + content: "\f157"; +} +.icon-renminbi:before, +.icon-cny:before { + content: "\f158"; +} +.icon-won:before, +.icon-krw:before { + content: "\f159"; +} +.icon-bitcoin:before, +.icon-btc:before { + content: "\f15a"; +} +.icon-file:before { + content: "\f15b"; +} +.icon-file-text:before { + content: "\f15c"; +} +.icon-sort-by-alphabet:before { + content: "\f15d"; +} +.icon-sort-by-alphabet-alt:before { + content: "\f15e"; +} +.icon-sort-by-attributes:before { + content: "\f160"; +} +.icon-sort-by-attributes-alt:before { + content: "\f161"; +} +.icon-sort-by-order:before { + content: "\f162"; +} +.icon-sort-by-order-alt:before { + content: "\f163"; +} +.icon-thumbs-up:before { + content: "\f164"; +} +.icon-thumbs-down:before { + content: "\f165"; +} +.icon-youtube-sign:before { + content: "\f166"; +} +.icon-youtube:before { + content: "\f167"; +} +.icon-xing:before { + content: "\f168"; +} +.icon-xing-sign:before { + content: "\f169"; +} +.icon-youtube-play:before { + content: "\f16a"; +} +.icon-dropbox:before { + content: "\f16b"; +} +.icon-stackexchange:before { + content: "\f16c"; +} +.icon-instagram:before { + content: "\f16d"; +} +.icon-flickr:before { + content: "\f16e"; +} +.icon-adn:before { + content: "\f170"; +} +.icon-bitbucket:before { + content: "\f171"; +} +.icon-bitbucket-sign:before { + content: "\f172"; +} +.icon-tumblr:before { + content: "\f173"; +} +.icon-tumblr-sign:before { + content: "\f174"; +} +.icon-long-arrow-down:before { + content: "\f175"; +} +.icon-long-arrow-up:before { + content: "\f176"; +} +.icon-long-arrow-left:before { + content: "\f177"; +} +.icon-long-arrow-right:before { + content: "\f178"; +} +.icon-apple:before { + content: "\f179"; +} +.icon-windows:before { + content: "\f17a"; +} +.icon-android:before { + content: "\f17b"; +} +.icon-linux:before { + content: "\f17c"; +} +.icon-dribbble:before { + content: "\f17d"; +} +.icon-skype:before { + content: "\f17e"; +} +.icon-foursquare:before { + content: "\f180"; +} +.icon-trello:before { + content: "\f181"; +} +.icon-female:before { + content: "\f182"; +} +.icon-male:before { + content: "\f183"; +} +.icon-gittip:before { + content: "\f184"; +} +.icon-sun:before { + content: "\f185"; +} +.icon-moon:before { + content: "\f186"; +} +.icon-archive:before { + content: "\f187"; +} +.icon-bug:before { + content: "\f188"; +} +.icon-vk:before { + content: "\f189"; +} +.icon-weibo:before { + content: "\f18a"; +} +.icon-renren:before { + content: "\f18b"; +} diff --git a/source/tpl_t3_blank/css/rtl/green/template-responsive.css b/source/tpl_t3_blank/css/rtl/green/template-responsive.css index 0ee06d433c..e3f3fac3d2 100644 --- a/source/tpl_t3_blank/css/rtl/green/template-responsive.css +++ b/source/tpl_t3_blank/css/rtl/green/template-responsive.css @@ -1124,9 +1124,9 @@ } } @media (max-width: 599px) { - article img[align=right], - .img_caption.left, article img[align=left], + .img_caption.left, + article img[align=right], .img_caption.right, .img-fulltext-left, .img-fulltext-right { diff --git a/source/tpl_t3_blank/css/rtl/green/template.css b/source/tpl_t3_blank/css/rtl/green/template.css index 39e59a94c9..c0d4b43635 100644 --- a/source/tpl_t3_blank/css/rtl/green/template.css +++ b/source/tpl_t3_blank/css/rtl/green/template.css @@ -1184,9 +1184,9 @@ input.invalid { .dropdown-submenu.pull-left > .dropdown-menu { right: -100%; margin-right: 10px; - -webkit-border-radius: 6px 6px 6px 6px; - -moz-border-radius: 6px 6px 6px 6px; - border-radius: 6px 6px 6px 6px; + -webkit-border-radius: 0 6px 6px 6px; + -moz-border-radius: 0 6px 6px 6px; + border-radius: 0 6px 6px 6px; } .dropdown .dropdown-menu .nav-header { padding-right: 20px; @@ -1608,12 +1608,12 @@ div.tagssimilar ul li a:active { font-size: 13px; margin-bottom: 20px; } -article img[align=right], +article img[align=left], .img_caption.left, .pull-left.item-image { margin: 0 40px 20px 0; } -article img[align=left], +article img[align=right], .img_caption.right, .pull-right.item-image { margin: 0 0 20px 40px; @@ -2236,17 +2236,17 @@ article aside .btn-group > .dropdown-toggle:focus { .input-prepend .chzn-container-single .chzn-single { border-color: #ccc; height: 26px; - -webkit-border-radius: 3px 3px; - -moz-border-radius: 3px 3px; - border-radius: 3px 3px; + -webkit-border-radius: 3px 0 0 3px; + -moz-border-radius: 3px 0 0 3px; + border-radius: 3px 0 0 3px; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; } .input-prepend .chzn-container-active .chzn-single-with-drop { - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; + -webkit-border-radius: 3px 0 0 0; + -moz-border-radius: 3px 0 0 0; + border-radius: 3px 0 0 0; } .input-prepend .chzn-container-single .chzn-drop { border-color: #ccc; diff --git a/source/tpl_t3_blank/css/rtl/orange/bootstrap.css b/source/tpl_t3_blank/css/rtl/orange/bootstrap.css index b545c6ccd6..fb8c555117 100644 --- a/source/tpl_t3_blank/css/rtl/orange/bootstrap.css +++ b/source/tpl_t3_blank/css/rtl/orange/bootstrap.css @@ -1684,8 +1684,8 @@ table th[class*="span"], @font-face { font-family: 'FontAwesome'; - src: url('../../../fonts/font-awesome/font/fontawesome-webfont.eot?v=3.1.0'); - src: url('../../../fonts/font-awesome/font/fontawesome-webfont.eot?#iefix&v=3.1.0') format('embedded-opentype'), url('../../../fonts/font-awesome/font/fontawesome-webfont.woff?v=3.1.0') format('woff'), url('../../../fonts/font-awesome/font/fontawesome-webfont.ttf?v=3.1.0') format('truetype'), url('../../../fonts/font-awesome/font/fontawesome-webfont.svg#fontawesomeregular?v=3.1.0') format('svg'); + src: url('../../../fonts/font-awesome/font/fontawesome-webfont.eot?v=3.2.1'); + src: url('../../../fonts/font-awesome/font/fontawesome-webfont.eot?#iefix&v=3.2.1') format('embedded-opentype'), url('../../../fonts/font-awesome/font/fontawesome-webfont.woff?v=3.2.1') format('woff'), url('../../../fonts/font-awesome/font/fontawesome-webfont.ttf?v=3.2.1') format('truetype'), url('../../../fonts/font-awesome/font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1') format('svg'); font-weight: normal; font-style: normal; } @@ -1709,30 +1709,33 @@ table th[class*="span"], font-size: 1.3333333333333em; } a [class^="icon-"], -a [class^="icon-"]:before, -a [class*=" icon-"], -a [class*=" icon-"]:before { +a [class*=" icon-"] { display: inline; } [class^="icon-"].icon-fixed-width, [class*=" icon-"].icon-fixed-width { display: inline-block; - width: 1.2857142857143em; - text-align: center; + width: 1.1428571428571em; + text-align: right; + padding-right: 0.28571428571429em; } [class^="icon-"].icon-fixed-width.icon-large, [class*=" icon-"].icon-fixed-width.icon-large { - width: 1.5714285714286em; + width: 1.4285714285714em; } -ul.icons-ul { - list-style-type: none; - text-indent: -0.71428571428571em; +.icons-ul { margin-left: 2.1428571428571em; + list-style-type: none; } -ul.icons-ul > li .icon-li { - width: 0.71428571428571em; - display: inline-block; +.icons-ul > li { + position: relative; +} +.icons-ul .icon-li { + position: absolute; + left: -2.1428571428571em; + width: 2.1428571428571em; text-align: center; + line-height: inherit; } [class^="icon-"].hide, [class*=" icon-"].hide { @@ -1902,6 +1905,10 @@ ul.icons-ul > li .icon-li { .btn.btn-large [class*=" icon-"].pull-right.icon-2x { margin-left: .2em; } +.nav-list [class^="icon-"], +.nav-list [class*=" icon-"] { + line-height: inherit; +} .icon-stack { position: relative; display: inline-block; @@ -1932,6 +1939,11 @@ ul.icons-ul > li .icon-li { -webkit-animation: spin 2s infinite linear; animation: spin 2s infinite linear; } +a .icon-stack, +a .icon-spin { + display: inline-block; + text-decoration: none; +} @-moz-keyframes spin { 0% { -moz-transform: rotate(0deg); @@ -2010,6 +2022,13 @@ ul.icons-ul > li .icon-li { -o-transform: scale(1,-1); transform: scale(1,-1); } +a .icon-rotate-90:before, +a .icon-rotate-180:before, +a .icon-rotate-270:before, +a .icon-flip-horizontal:before, +a .icon-flip-vertical:before { + display: inline-block; +} .icon-glass:before { content: "\f000"; } @@ -2019,7 +2038,7 @@ ul.icons-ul > li .icon-li { .icon-search:before { content: "\f002"; } -.icon-envelope:before { +.icon-envelope-alt:before { content: "\f003"; } .icon-heart:before { @@ -2058,12 +2077,14 @@ ul.icons-ul > li .icon-li { .icon-zoom-out:before { content: "\f010"; } +.icon-power-off:before, .icon-off:before { content: "\f011"; } .icon-signal:before { content: "\f012"; } +.icon-gear:before, .icon-cog:before { content: "\f013"; } @@ -2073,7 +2094,7 @@ ul.icons-ul > li .icon-li { .icon-home:before { content: "\f015"; } -.icon-file:before { +.icon-file-alt:before { content: "\f016"; } .icon-time:before { @@ -2097,8 +2118,8 @@ ul.icons-ul > li .icon-li { .icon-play-circle:before { content: "\f01d"; } -.icon-repeat:before, -.icon-rotate-right:before { +.icon-rotate-right:before, +.icon-repeat:before { content: "\f01e"; } .icon-refresh:before { @@ -2293,8 +2314,8 @@ ul.icons-ul > li .icon-li { .icon-arrow-down:before { content: "\f063"; } -.icon-share-alt:before, -.icon-mail-forward:before { +.icon-mail-forward:before, +.icon-share-alt:before { content: "\f064"; } .icon-resize-full:before { @@ -2387,16 +2408,17 @@ ul.icons-ul > li .icon-li { .icon-key:before { content: "\f084"; } +.icon-gears:before, .icon-cogs:before { content: "\f085"; } .icon-comments:before { content: "\f086"; } -.icon-thumbs-up:before { +.icon-thumbs-up-alt:before { content: "\f087"; } -.icon-thumbs-down:before { +.icon-thumbs-down-alt:before { content: "\f088"; } .icon-star-half:before { @@ -2435,6 +2457,7 @@ ul.icons-ul > li .icon-li { .icon-phone:before { content: "\f095"; } +.icon-unchecked:before, .icon-check-empty:before { content: "\f096"; } @@ -2534,6 +2557,7 @@ ul.icons-ul > li .icon-li { .icon-copy:before { content: "\f0c5"; } +.icon-paperclip:before, .icon-paper-clip:before { content: "\f0c6"; } @@ -2606,14 +2630,14 @@ ul.icons-ul > li .icon-li { .icon-sort-up:before { content: "\f0de"; } -.icon-envelope-alt:before { +.icon-envelope:before { content: "\f0e0"; } .icon-linkedin:before { content: "\f0e1"; } -.icon-undo:before, -.icon-rotate-left:before { +.icon-rotate-left:before, +.icon-undo:before { content: "\f0e2"; } .icon-legal:before { @@ -2670,7 +2694,7 @@ ul.icons-ul > li .icon-li { .icon-food:before { content: "\f0f5"; } -.icon-file-alt:before { +.icon-file-text-alt:before { content: "\f0f6"; } .icon-building:before { @@ -2748,10 +2772,13 @@ ul.icons-ul > li .icon-li { .icon-circle:before { content: "\f111"; } -.icon-reply:before, -.icon-mail-reply:before { +.icon-mail-reply:before, +.icon-reply:before { content: "\f112"; } +.icon-github-alt:before { + content: "\f113"; +} .icon-folder-close-alt:before { content: "\f114"; } @@ -2921,6 +2948,187 @@ ul.icons-ul > li .icon-li { .icon-share-sign:before { content: "\f14d"; } +.icon-compass:before { + content: "\f14e"; +} +.icon-collapse:before { + content: "\f150"; +} +.icon-collapse-top:before { + content: "\f151"; +} +.icon-expand:before { + content: "\f152"; +} +.icon-euro:before, +.icon-eur:before { + content: "\f153"; +} +.icon-gbp:before { + content: "\f154"; +} +.icon-dollar:before, +.icon-usd:before { + content: "\f155"; +} +.icon-rupee:before, +.icon-inr:before { + content: "\f156"; +} +.icon-yen:before, +.icon-jpy:before { + content: "\f157"; +} +.icon-renminbi:before, +.icon-cny:before { + content: "\f158"; +} +.icon-won:before, +.icon-krw:before { + content: "\f159"; +} +.icon-bitcoin:before, +.icon-btc:before { + content: "\f15a"; +} +.icon-file:before { + content: "\f15b"; +} +.icon-file-text:before { + content: "\f15c"; +} +.icon-sort-by-alphabet:before { + content: "\f15d"; +} +.icon-sort-by-alphabet-alt:before { + content: "\f15e"; +} +.icon-sort-by-attributes:before { + content: "\f160"; +} +.icon-sort-by-attributes-alt:before { + content: "\f161"; +} +.icon-sort-by-order:before { + content: "\f162"; +} +.icon-sort-by-order-alt:before { + content: "\f163"; +} +.icon-thumbs-up:before { + content: "\f164"; +} +.icon-thumbs-down:before { + content: "\f165"; +} +.icon-youtube-sign:before { + content: "\f166"; +} +.icon-youtube:before { + content: "\f167"; +} +.icon-xing:before { + content: "\f168"; +} +.icon-xing-sign:before { + content: "\f169"; +} +.icon-youtube-play:before { + content: "\f16a"; +} +.icon-dropbox:before { + content: "\f16b"; +} +.icon-stackexchange:before { + content: "\f16c"; +} +.icon-instagram:before { + content: "\f16d"; +} +.icon-flickr:before { + content: "\f16e"; +} +.icon-adn:before { + content: "\f170"; +} +.icon-bitbucket:before { + content: "\f171"; +} +.icon-bitbucket-sign:before { + content: "\f172"; +} +.icon-tumblr:before { + content: "\f173"; +} +.icon-tumblr-sign:before { + content: "\f174"; +} +.icon-long-arrow-down:before { + content: "\f175"; +} +.icon-long-arrow-up:before { + content: "\f176"; +} +.icon-long-arrow-left:before { + content: "\f177"; +} +.icon-long-arrow-right:before { + content: "\f178"; +} +.icon-apple:before { + content: "\f179"; +} +.icon-windows:before { + content: "\f17a"; +} +.icon-android:before { + content: "\f17b"; +} +.icon-linux:before { + content: "\f17c"; +} +.icon-dribbble:before { + content: "\f17d"; +} +.icon-skype:before { + content: "\f17e"; +} +.icon-foursquare:before { + content: "\f180"; +} +.icon-trello:before { + content: "\f181"; +} +.icon-female:before { + content: "\f182"; +} +.icon-male:before { + content: "\f183"; +} +.icon-gittip:before { + content: "\f184"; +} +.icon-sun:before { + content: "\f185"; +} +.icon-moon:before { + content: "\f186"; +} +.icon-archive:before { + content: "\f187"; +} +.icon-bug:before { + content: "\f188"; +} +.icon-vk:before { + content: "\f189"; +} +.icon-weibo:before { + content: "\f18a"; +} +.icon-renren:before { + content: "\f18b"; +} diff --git a/source/tpl_t3_blank/css/rtl/orange/template-responsive.css b/source/tpl_t3_blank/css/rtl/orange/template-responsive.css index 0ee06d433c..e3f3fac3d2 100644 --- a/source/tpl_t3_blank/css/rtl/orange/template-responsive.css +++ b/source/tpl_t3_blank/css/rtl/orange/template-responsive.css @@ -1124,9 +1124,9 @@ } } @media (max-width: 599px) { - article img[align=right], - .img_caption.left, article img[align=left], + .img_caption.left, + article img[align=right], .img_caption.right, .img-fulltext-left, .img-fulltext-right { diff --git a/source/tpl_t3_blank/css/rtl/orange/template.css b/source/tpl_t3_blank/css/rtl/orange/template.css index 5ebf02fc95..0ec66c0080 100644 --- a/source/tpl_t3_blank/css/rtl/orange/template.css +++ b/source/tpl_t3_blank/css/rtl/orange/template.css @@ -1184,9 +1184,9 @@ input.invalid { .dropdown-submenu.pull-left > .dropdown-menu { right: -100%; margin-right: 10px; - -webkit-border-radius: 6px 6px 6px 6px; - -moz-border-radius: 6px 6px 6px 6px; - border-radius: 6px 6px 6px 6px; + -webkit-border-radius: 0 6px 6px 6px; + -moz-border-radius: 0 6px 6px 6px; + border-radius: 0 6px 6px 6px; } .dropdown .dropdown-menu .nav-header { padding-right: 20px; @@ -1608,12 +1608,12 @@ div.tagssimilar ul li a:active { font-size: 13px; margin-bottom: 20px; } -article img[align=right], +article img[align=left], .img_caption.left, .pull-left.item-image { margin: 0 40px 20px 0; } -article img[align=left], +article img[align=right], .img_caption.right, .pull-right.item-image { margin: 0 0 20px 40px; @@ -2236,17 +2236,17 @@ article aside .btn-group > .dropdown-toggle:focus { .input-prepend .chzn-container-single .chzn-single { border-color: #ccc; height: 26px; - -webkit-border-radius: 3px 3px; - -moz-border-radius: 3px 3px; - border-radius: 3px 3px; + -webkit-border-radius: 3px 0 0 3px; + -moz-border-radius: 3px 0 0 3px; + border-radius: 3px 0 0 3px; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; } .input-prepend .chzn-container-active .chzn-single-with-drop { - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; + -webkit-border-radius: 3px 0 0 0; + -moz-border-radius: 3px 0 0 0; + border-radius: 3px 0 0 0; } .input-prepend .chzn-container-single .chzn-drop { border-color: #ccc; diff --git a/source/tpl_t3_blank/css/rtl/red/bootstrap.css b/source/tpl_t3_blank/css/rtl/red/bootstrap.css index 80abe41279..5b0d960de2 100644 --- a/source/tpl_t3_blank/css/rtl/red/bootstrap.css +++ b/source/tpl_t3_blank/css/rtl/red/bootstrap.css @@ -1684,8 +1684,8 @@ table th[class*="span"], @font-face { font-family: 'FontAwesome'; - src: url('../../../fonts/font-awesome/font/fontawesome-webfont.eot?v=3.1.0'); - src: url('../../../fonts/font-awesome/font/fontawesome-webfont.eot?#iefix&v=3.1.0') format('embedded-opentype'), url('../../../fonts/font-awesome/font/fontawesome-webfont.woff?v=3.1.0') format('woff'), url('../../../fonts/font-awesome/font/fontawesome-webfont.ttf?v=3.1.0') format('truetype'), url('../../../fonts/font-awesome/font/fontawesome-webfont.svg#fontawesomeregular?v=3.1.0') format('svg'); + src: url('../../../fonts/font-awesome/font/fontawesome-webfont.eot?v=3.2.1'); + src: url('../../../fonts/font-awesome/font/fontawesome-webfont.eot?#iefix&v=3.2.1') format('embedded-opentype'), url('../../../fonts/font-awesome/font/fontawesome-webfont.woff?v=3.2.1') format('woff'), url('../../../fonts/font-awesome/font/fontawesome-webfont.ttf?v=3.2.1') format('truetype'), url('../../../fonts/font-awesome/font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1') format('svg'); font-weight: normal; font-style: normal; } @@ -1709,30 +1709,33 @@ table th[class*="span"], font-size: 1.3333333333333em; } a [class^="icon-"], -a [class^="icon-"]:before, -a [class*=" icon-"], -a [class*=" icon-"]:before { +a [class*=" icon-"] { display: inline; } [class^="icon-"].icon-fixed-width, [class*=" icon-"].icon-fixed-width { display: inline-block; - width: 1.2857142857143em; - text-align: center; + width: 1.1428571428571em; + text-align: right; + padding-right: 0.28571428571429em; } [class^="icon-"].icon-fixed-width.icon-large, [class*=" icon-"].icon-fixed-width.icon-large { - width: 1.5714285714286em; + width: 1.4285714285714em; } -ul.icons-ul { - list-style-type: none; - text-indent: -0.71428571428571em; +.icons-ul { margin-left: 2.1428571428571em; + list-style-type: none; } -ul.icons-ul > li .icon-li { - width: 0.71428571428571em; - display: inline-block; +.icons-ul > li { + position: relative; +} +.icons-ul .icon-li { + position: absolute; + left: -2.1428571428571em; + width: 2.1428571428571em; text-align: center; + line-height: inherit; } [class^="icon-"].hide, [class*=" icon-"].hide { @@ -1902,6 +1905,10 @@ ul.icons-ul > li .icon-li { .btn.btn-large [class*=" icon-"].pull-right.icon-2x { margin-left: .2em; } +.nav-list [class^="icon-"], +.nav-list [class*=" icon-"] { + line-height: inherit; +} .icon-stack { position: relative; display: inline-block; @@ -1932,6 +1939,11 @@ ul.icons-ul > li .icon-li { -webkit-animation: spin 2s infinite linear; animation: spin 2s infinite linear; } +a .icon-stack, +a .icon-spin { + display: inline-block; + text-decoration: none; +} @-moz-keyframes spin { 0% { -moz-transform: rotate(0deg); @@ -2010,6 +2022,13 @@ ul.icons-ul > li .icon-li { -o-transform: scale(1,-1); transform: scale(1,-1); } +a .icon-rotate-90:before, +a .icon-rotate-180:before, +a .icon-rotate-270:before, +a .icon-flip-horizontal:before, +a .icon-flip-vertical:before { + display: inline-block; +} .icon-glass:before { content: "\f000"; } @@ -2019,7 +2038,7 @@ ul.icons-ul > li .icon-li { .icon-search:before { content: "\f002"; } -.icon-envelope:before { +.icon-envelope-alt:before { content: "\f003"; } .icon-heart:before { @@ -2058,12 +2077,14 @@ ul.icons-ul > li .icon-li { .icon-zoom-out:before { content: "\f010"; } +.icon-power-off:before, .icon-off:before { content: "\f011"; } .icon-signal:before { content: "\f012"; } +.icon-gear:before, .icon-cog:before { content: "\f013"; } @@ -2073,7 +2094,7 @@ ul.icons-ul > li .icon-li { .icon-home:before { content: "\f015"; } -.icon-file:before { +.icon-file-alt:before { content: "\f016"; } .icon-time:before { @@ -2097,8 +2118,8 @@ ul.icons-ul > li .icon-li { .icon-play-circle:before { content: "\f01d"; } -.icon-repeat:before, -.icon-rotate-right:before { +.icon-rotate-right:before, +.icon-repeat:before { content: "\f01e"; } .icon-refresh:before { @@ -2293,8 +2314,8 @@ ul.icons-ul > li .icon-li { .icon-arrow-down:before { content: "\f063"; } -.icon-share-alt:before, -.icon-mail-forward:before { +.icon-mail-forward:before, +.icon-share-alt:before { content: "\f064"; } .icon-resize-full:before { @@ -2387,16 +2408,17 @@ ul.icons-ul > li .icon-li { .icon-key:before { content: "\f084"; } +.icon-gears:before, .icon-cogs:before { content: "\f085"; } .icon-comments:before { content: "\f086"; } -.icon-thumbs-up:before { +.icon-thumbs-up-alt:before { content: "\f087"; } -.icon-thumbs-down:before { +.icon-thumbs-down-alt:before { content: "\f088"; } .icon-star-half:before { @@ -2435,6 +2457,7 @@ ul.icons-ul > li .icon-li { .icon-phone:before { content: "\f095"; } +.icon-unchecked:before, .icon-check-empty:before { content: "\f096"; } @@ -2534,6 +2557,7 @@ ul.icons-ul > li .icon-li { .icon-copy:before { content: "\f0c5"; } +.icon-paperclip:before, .icon-paper-clip:before { content: "\f0c6"; } @@ -2606,14 +2630,14 @@ ul.icons-ul > li .icon-li { .icon-sort-up:before { content: "\f0de"; } -.icon-envelope-alt:before { +.icon-envelope:before { content: "\f0e0"; } .icon-linkedin:before { content: "\f0e1"; } -.icon-undo:before, -.icon-rotate-left:before { +.icon-rotate-left:before, +.icon-undo:before { content: "\f0e2"; } .icon-legal:before { @@ -2670,7 +2694,7 @@ ul.icons-ul > li .icon-li { .icon-food:before { content: "\f0f5"; } -.icon-file-alt:before { +.icon-file-text-alt:before { content: "\f0f6"; } .icon-building:before { @@ -2748,10 +2772,13 @@ ul.icons-ul > li .icon-li { .icon-circle:before { content: "\f111"; } -.icon-reply:before, -.icon-mail-reply:before { +.icon-mail-reply:before, +.icon-reply:before { content: "\f112"; } +.icon-github-alt:before { + content: "\f113"; +} .icon-folder-close-alt:before { content: "\f114"; } @@ -2921,6 +2948,187 @@ ul.icons-ul > li .icon-li { .icon-share-sign:before { content: "\f14d"; } +.icon-compass:before { + content: "\f14e"; +} +.icon-collapse:before { + content: "\f150"; +} +.icon-collapse-top:before { + content: "\f151"; +} +.icon-expand:before { + content: "\f152"; +} +.icon-euro:before, +.icon-eur:before { + content: "\f153"; +} +.icon-gbp:before { + content: "\f154"; +} +.icon-dollar:before, +.icon-usd:before { + content: "\f155"; +} +.icon-rupee:before, +.icon-inr:before { + content: "\f156"; +} +.icon-yen:before, +.icon-jpy:before { + content: "\f157"; +} +.icon-renminbi:before, +.icon-cny:before { + content: "\f158"; +} +.icon-won:before, +.icon-krw:before { + content: "\f159"; +} +.icon-bitcoin:before, +.icon-btc:before { + content: "\f15a"; +} +.icon-file:before { + content: "\f15b"; +} +.icon-file-text:before { + content: "\f15c"; +} +.icon-sort-by-alphabet:before { + content: "\f15d"; +} +.icon-sort-by-alphabet-alt:before { + content: "\f15e"; +} +.icon-sort-by-attributes:before { + content: "\f160"; +} +.icon-sort-by-attributes-alt:before { + content: "\f161"; +} +.icon-sort-by-order:before { + content: "\f162"; +} +.icon-sort-by-order-alt:before { + content: "\f163"; +} +.icon-thumbs-up:before { + content: "\f164"; +} +.icon-thumbs-down:before { + content: "\f165"; +} +.icon-youtube-sign:before { + content: "\f166"; +} +.icon-youtube:before { + content: "\f167"; +} +.icon-xing:before { + content: "\f168"; +} +.icon-xing-sign:before { + content: "\f169"; +} +.icon-youtube-play:before { + content: "\f16a"; +} +.icon-dropbox:before { + content: "\f16b"; +} +.icon-stackexchange:before { + content: "\f16c"; +} +.icon-instagram:before { + content: "\f16d"; +} +.icon-flickr:before { + content: "\f16e"; +} +.icon-adn:before { + content: "\f170"; +} +.icon-bitbucket:before { + content: "\f171"; +} +.icon-bitbucket-sign:before { + content: "\f172"; +} +.icon-tumblr:before { + content: "\f173"; +} +.icon-tumblr-sign:before { + content: "\f174"; +} +.icon-long-arrow-down:before { + content: "\f175"; +} +.icon-long-arrow-up:before { + content: "\f176"; +} +.icon-long-arrow-left:before { + content: "\f177"; +} +.icon-long-arrow-right:before { + content: "\f178"; +} +.icon-apple:before { + content: "\f179"; +} +.icon-windows:before { + content: "\f17a"; +} +.icon-android:before { + content: "\f17b"; +} +.icon-linux:before { + content: "\f17c"; +} +.icon-dribbble:before { + content: "\f17d"; +} +.icon-skype:before { + content: "\f17e"; +} +.icon-foursquare:before { + content: "\f180"; +} +.icon-trello:before { + content: "\f181"; +} +.icon-female:before { + content: "\f182"; +} +.icon-male:before { + content: "\f183"; +} +.icon-gittip:before { + content: "\f184"; +} +.icon-sun:before { + content: "\f185"; +} +.icon-moon:before { + content: "\f186"; +} +.icon-archive:before { + content: "\f187"; +} +.icon-bug:before { + content: "\f188"; +} +.icon-vk:before { + content: "\f189"; +} +.icon-weibo:before { + content: "\f18a"; +} +.icon-renren:before { + content: "\f18b"; +} diff --git a/source/tpl_t3_blank/css/rtl/red/template-responsive.css b/source/tpl_t3_blank/css/rtl/red/template-responsive.css index 03310641f5..74f2e5619c 100644 --- a/source/tpl_t3_blank/css/rtl/red/template-responsive.css +++ b/source/tpl_t3_blank/css/rtl/red/template-responsive.css @@ -1150,9 +1150,9 @@ } } @media (max-width: 599px) { - article img[align=right], - .img_caption.left, article img[align=left], + .img_caption.left, + article img[align=right], .img_caption.right, .img-fulltext-left, .img-fulltext-right { diff --git a/source/tpl_t3_blank/css/rtl/red/template.css b/source/tpl_t3_blank/css/rtl/red/template.css index 2b2176bb78..ddf586d05e 100644 --- a/source/tpl_t3_blank/css/rtl/red/template.css +++ b/source/tpl_t3_blank/css/rtl/red/template.css @@ -1184,9 +1184,9 @@ input.invalid { .dropdown-submenu.pull-left > .dropdown-menu { right: -100%; margin-right: 10px; - -webkit-border-radius: 6px 6px 6px 6px; - -moz-border-radius: 6px 6px 6px 6px; - border-radius: 6px 6px 6px 6px; + -webkit-border-radius: 0 6px 6px 6px; + -moz-border-radius: 0 6px 6px 6px; + border-radius: 0 6px 6px 6px; } .dropdown .dropdown-menu .nav-header { padding-right: 20px; @@ -1675,12 +1675,12 @@ div.tagssimilar ul li a:active { font-size: 13px; margin-bottom: 20px; } -article img[align=right], +article img[align=left], .img_caption.left, .pull-left.item-image { margin: 0 40px 20px 0; } -article img[align=left], +article img[align=right], .img_caption.right, .pull-right.item-image { margin: 0 0 20px 40px; @@ -2303,17 +2303,17 @@ article aside .btn-group > .dropdown-toggle:focus { .input-prepend .chzn-container-single .chzn-single { border-color: #ccc; height: 26px; - -webkit-border-radius: 3px 3px; - -moz-border-radius: 3px 3px; - border-radius: 3px 3px; + -webkit-border-radius: 3px 0 0 3px; + -moz-border-radius: 3px 0 0 3px; + border-radius: 3px 0 0 3px; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; } .input-prepend .chzn-container-active .chzn-single-with-drop { - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; + -webkit-border-radius: 3px 0 0 0; + -moz-border-radius: 3px 0 0 0; + border-radius: 3px 0 0 0; } .input-prepend .chzn-container-single .chzn-drop { border-color: #ccc; diff --git a/source/tpl_t3_blank/css/rtl/template-responsive.css b/source/tpl_t3_blank/css/rtl/template-responsive.css index 0ee06d433c..e3f3fac3d2 100644 --- a/source/tpl_t3_blank/css/rtl/template-responsive.css +++ b/source/tpl_t3_blank/css/rtl/template-responsive.css @@ -1124,9 +1124,9 @@ } } @media (max-width: 599px) { - article img[align=right], - .img_caption.left, article img[align=left], + .img_caption.left, + article img[align=right], .img_caption.right, .img-fulltext-left, .img-fulltext-right { diff --git a/source/tpl_t3_blank/css/rtl/template.css b/source/tpl_t3_blank/css/rtl/template.css index a4a808baeb..2204ab32f3 100644 --- a/source/tpl_t3_blank/css/rtl/template.css +++ b/source/tpl_t3_blank/css/rtl/template.css @@ -1184,9 +1184,9 @@ input.invalid { .dropdown-submenu.pull-left > .dropdown-menu { right: -100%; margin-right: 10px; - -webkit-border-radius: 6px 6px 6px 6px; - -moz-border-radius: 6px 6px 6px 6px; - border-radius: 6px 6px 6px 6px; + -webkit-border-radius: 0 6px 6px 6px; + -moz-border-radius: 0 6px 6px 6px; + border-radius: 0 6px 6px 6px; } .dropdown .dropdown-menu .nav-header { padding-right: 20px; @@ -1608,12 +1608,12 @@ div.tagssimilar ul li a:active { font-size: 13px; margin-bottom: 20px; } -article img[align=right], +article img[align=left], .img_caption.left, .pull-left.item-image { margin: 0 40px 20px 0; } -article img[align=left], +article img[align=right], .img_caption.right, .pull-right.item-image { margin: 0 0 20px 40px; @@ -2236,17 +2236,17 @@ article aside .btn-group > .dropdown-toggle:focus { .input-prepend .chzn-container-single .chzn-single { border-color: #ccc; height: 26px; - -webkit-border-radius: 3px 3px; - -moz-border-radius: 3px 3px; - border-radius: 3px 3px; + -webkit-border-radius: 3px 0 0 3px; + -moz-border-radius: 3px 0 0 3px; + border-radius: 3px 0 0 3px; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; } .input-prepend .chzn-container-active .chzn-single-with-drop { - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; + -webkit-border-radius: 3px 0 0 0; + -moz-border-radius: 3px 0 0 0; + border-radius: 3px 0 0 0; } .input-prepend .chzn-container-single .chzn-drop { border-color: #ccc; diff --git a/source/tpl_t3_blank/css/themes/dark/bootstrap.css b/source/tpl_t3_blank/css/themes/dark/bootstrap.css index d4dac80a27..767f1957e3 100644 --- a/source/tpl_t3_blank/css/themes/dark/bootstrap.css +++ b/source/tpl_t3_blank/css/themes/dark/bootstrap.css @@ -1684,8 +1684,8 @@ table th[class*="span"], @font-face { font-family: 'FontAwesome'; - src: url('../../../fonts/font-awesome/font/fontawesome-webfont.eot?v=3.1.0'); - src: url('../../../fonts/font-awesome/font/fontawesome-webfont.eot?#iefix&v=3.1.0') format('embedded-opentype'), url('../../../fonts/font-awesome/font/fontawesome-webfont.woff?v=3.1.0') format('woff'), url('../../../fonts/font-awesome/font/fontawesome-webfont.ttf?v=3.1.0') format('truetype'), url('../../../fonts/font-awesome/font/fontawesome-webfont.svg#fontawesomeregular?v=3.1.0') format('svg'); + src: url('../../../fonts/font-awesome/font/fontawesome-webfont.eot?v=3.2.1'); + src: url('../../../fonts/font-awesome/font/fontawesome-webfont.eot?#iefix&v=3.2.1') format('embedded-opentype'), url('../../../fonts/font-awesome/font/fontawesome-webfont.woff?v=3.2.1') format('woff'), url('../../../fonts/font-awesome/font/fontawesome-webfont.ttf?v=3.2.1') format('truetype'), url('../../../fonts/font-awesome/font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1') format('svg'); font-weight: normal; font-style: normal; } @@ -1709,30 +1709,33 @@ table th[class*="span"], font-size: 1.3333333333333em; } a [class^="icon-"], -a [class^="icon-"]:before, -a [class*=" icon-"], -a [class*=" icon-"]:before { +a [class*=" icon-"] { display: inline; } [class^="icon-"].icon-fixed-width, [class*=" icon-"].icon-fixed-width { display: inline-block; - width: 1.2857142857143em; - text-align: center; + width: 1.1428571428571em; + text-align: right; + padding-right: 0.28571428571429em; } [class^="icon-"].icon-fixed-width.icon-large, [class*=" icon-"].icon-fixed-width.icon-large { - width: 1.5714285714286em; + width: 1.4285714285714em; } -ul.icons-ul { - list-style-type: none; - text-indent: -0.71428571428571em; +.icons-ul { margin-left: 2.1428571428571em; + list-style-type: none; } -ul.icons-ul > li .icon-li { - width: 0.71428571428571em; - display: inline-block; +.icons-ul > li { + position: relative; +} +.icons-ul .icon-li { + position: absolute; + left: -2.1428571428571em; + width: 2.1428571428571em; text-align: center; + line-height: inherit; } [class^="icon-"].hide, [class*=" icon-"].hide { @@ -1902,6 +1905,10 @@ ul.icons-ul > li .icon-li { .btn.btn-large [class*=" icon-"].pull-right.icon-2x { margin-left: .2em; } +.nav-list [class^="icon-"], +.nav-list [class*=" icon-"] { + line-height: inherit; +} .icon-stack { position: relative; display: inline-block; @@ -1932,6 +1939,11 @@ ul.icons-ul > li .icon-li { -webkit-animation: spin 2s infinite linear; animation: spin 2s infinite linear; } +a .icon-stack, +a .icon-spin { + display: inline-block; + text-decoration: none; +} @-moz-keyframes spin { 0% { -moz-transform: rotate(0deg); @@ -2010,6 +2022,13 @@ ul.icons-ul > li .icon-li { -o-transform: scale(1,-1); transform: scale(1,-1); } +a .icon-rotate-90:before, +a .icon-rotate-180:before, +a .icon-rotate-270:before, +a .icon-flip-horizontal:before, +a .icon-flip-vertical:before { + display: inline-block; +} .icon-glass:before { content: "\f000"; } @@ -2019,7 +2038,7 @@ ul.icons-ul > li .icon-li { .icon-search:before { content: "\f002"; } -.icon-envelope:before { +.icon-envelope-alt:before { content: "\f003"; } .icon-heart:before { @@ -2058,12 +2077,14 @@ ul.icons-ul > li .icon-li { .icon-zoom-out:before { content: "\f010"; } +.icon-power-off:before, .icon-off:before { content: "\f011"; } .icon-signal:before { content: "\f012"; } +.icon-gear:before, .icon-cog:before { content: "\f013"; } @@ -2073,7 +2094,7 @@ ul.icons-ul > li .icon-li { .icon-home:before { content: "\f015"; } -.icon-file:before { +.icon-file-alt:before { content: "\f016"; } .icon-time:before { @@ -2097,8 +2118,8 @@ ul.icons-ul > li .icon-li { .icon-play-circle:before { content: "\f01d"; } -.icon-repeat:before, -.icon-rotate-right:before { +.icon-rotate-right:before, +.icon-repeat:before { content: "\f01e"; } .icon-refresh:before { @@ -2293,8 +2314,8 @@ ul.icons-ul > li .icon-li { .icon-arrow-down:before { content: "\f063"; } -.icon-share-alt:before, -.icon-mail-forward:before { +.icon-mail-forward:before, +.icon-share-alt:before { content: "\f064"; } .icon-resize-full:before { @@ -2387,16 +2408,17 @@ ul.icons-ul > li .icon-li { .icon-key:before { content: "\f084"; } +.icon-gears:before, .icon-cogs:before { content: "\f085"; } .icon-comments:before { content: "\f086"; } -.icon-thumbs-up:before { +.icon-thumbs-up-alt:before { content: "\f087"; } -.icon-thumbs-down:before { +.icon-thumbs-down-alt:before { content: "\f088"; } .icon-star-half:before { @@ -2435,6 +2457,7 @@ ul.icons-ul > li .icon-li { .icon-phone:before { content: "\f095"; } +.icon-unchecked:before, .icon-check-empty:before { content: "\f096"; } @@ -2534,6 +2557,7 @@ ul.icons-ul > li .icon-li { .icon-copy:before { content: "\f0c5"; } +.icon-paperclip:before, .icon-paper-clip:before { content: "\f0c6"; } @@ -2606,14 +2630,14 @@ ul.icons-ul > li .icon-li { .icon-sort-up:before { content: "\f0de"; } -.icon-envelope-alt:before { +.icon-envelope:before { content: "\f0e0"; } .icon-linkedin:before { content: "\f0e1"; } -.icon-undo:before, -.icon-rotate-left:before { +.icon-rotate-left:before, +.icon-undo:before { content: "\f0e2"; } .icon-legal:before { @@ -2670,7 +2694,7 @@ ul.icons-ul > li .icon-li { .icon-food:before { content: "\f0f5"; } -.icon-file-alt:before { +.icon-file-text-alt:before { content: "\f0f6"; } .icon-building:before { @@ -2748,10 +2772,13 @@ ul.icons-ul > li .icon-li { .icon-circle:before { content: "\f111"; } -.icon-reply:before, -.icon-mail-reply:before { +.icon-mail-reply:before, +.icon-reply:before { content: "\f112"; } +.icon-github-alt:before { + content: "\f113"; +} .icon-folder-close-alt:before { content: "\f114"; } @@ -2921,6 +2948,187 @@ ul.icons-ul > li .icon-li { .icon-share-sign:before { content: "\f14d"; } +.icon-compass:before { + content: "\f14e"; +} +.icon-collapse:before { + content: "\f150"; +} +.icon-collapse-top:before { + content: "\f151"; +} +.icon-expand:before { + content: "\f152"; +} +.icon-euro:before, +.icon-eur:before { + content: "\f153"; +} +.icon-gbp:before { + content: "\f154"; +} +.icon-dollar:before, +.icon-usd:before { + content: "\f155"; +} +.icon-rupee:before, +.icon-inr:before { + content: "\f156"; +} +.icon-yen:before, +.icon-jpy:before { + content: "\f157"; +} +.icon-renminbi:before, +.icon-cny:before { + content: "\f158"; +} +.icon-won:before, +.icon-krw:before { + content: "\f159"; +} +.icon-bitcoin:before, +.icon-btc:before { + content: "\f15a"; +} +.icon-file:before { + content: "\f15b"; +} +.icon-file-text:before { + content: "\f15c"; +} +.icon-sort-by-alphabet:before { + content: "\f15d"; +} +.icon-sort-by-alphabet-alt:before { + content: "\f15e"; +} +.icon-sort-by-attributes:before { + content: "\f160"; +} +.icon-sort-by-attributes-alt:before { + content: "\f161"; +} +.icon-sort-by-order:before { + content: "\f162"; +} +.icon-sort-by-order-alt:before { + content: "\f163"; +} +.icon-thumbs-up:before { + content: "\f164"; +} +.icon-thumbs-down:before { + content: "\f165"; +} +.icon-youtube-sign:before { + content: "\f166"; +} +.icon-youtube:before { + content: "\f167"; +} +.icon-xing:before { + content: "\f168"; +} +.icon-xing-sign:before { + content: "\f169"; +} +.icon-youtube-play:before { + content: "\f16a"; +} +.icon-dropbox:before { + content: "\f16b"; +} +.icon-stackexchange:before { + content: "\f16c"; +} +.icon-instagram:before { + content: "\f16d"; +} +.icon-flickr:before { + content: "\f16e"; +} +.icon-adn:before { + content: "\f170"; +} +.icon-bitbucket:before { + content: "\f171"; +} +.icon-bitbucket-sign:before { + content: "\f172"; +} +.icon-tumblr:before { + content: "\f173"; +} +.icon-tumblr-sign:before { + content: "\f174"; +} +.icon-long-arrow-down:before { + content: "\f175"; +} +.icon-long-arrow-up:before { + content: "\f176"; +} +.icon-long-arrow-left:before { + content: "\f177"; +} +.icon-long-arrow-right:before { + content: "\f178"; +} +.icon-apple:before { + content: "\f179"; +} +.icon-windows:before { + content: "\f17a"; +} +.icon-android:before { + content: "\f17b"; +} +.icon-linux:before { + content: "\f17c"; +} +.icon-dribbble:before { + content: "\f17d"; +} +.icon-skype:before { + content: "\f17e"; +} +.icon-foursquare:before { + content: "\f180"; +} +.icon-trello:before { + content: "\f181"; +} +.icon-female:before { + content: "\f182"; +} +.icon-male:before { + content: "\f183"; +} +.icon-gittip:before { + content: "\f184"; +} +.icon-sun:before { + content: "\f185"; +} +.icon-moon:before { + content: "\f186"; +} +.icon-archive:before { + content: "\f187"; +} +.icon-bug:before { + content: "\f188"; +} +.icon-vk:before { + content: "\f189"; +} +.icon-weibo:before { + content: "\f18a"; +} +.icon-renren:before { + content: "\f18b"; +} diff --git a/source/tpl_t3_blank/css/themes/green/bootstrap.css b/source/tpl_t3_blank/css/themes/green/bootstrap.css index 47ae067006..410cbbdab5 100644 --- a/source/tpl_t3_blank/css/themes/green/bootstrap.css +++ b/source/tpl_t3_blank/css/themes/green/bootstrap.css @@ -1684,8 +1684,8 @@ table th[class*="span"], @font-face { font-family: 'FontAwesome'; - src: url('../../../fonts/font-awesome/font/fontawesome-webfont.eot?v=3.1.0'); - src: url('../../../fonts/font-awesome/font/fontawesome-webfont.eot?#iefix&v=3.1.0') format('embedded-opentype'), url('../../../fonts/font-awesome/font/fontawesome-webfont.woff?v=3.1.0') format('woff'), url('../../../fonts/font-awesome/font/fontawesome-webfont.ttf?v=3.1.0') format('truetype'), url('../../../fonts/font-awesome/font/fontawesome-webfont.svg#fontawesomeregular?v=3.1.0') format('svg'); + src: url('../../../fonts/font-awesome/font/fontawesome-webfont.eot?v=3.2.1'); + src: url('../../../fonts/font-awesome/font/fontawesome-webfont.eot?#iefix&v=3.2.1') format('embedded-opentype'), url('../../../fonts/font-awesome/font/fontawesome-webfont.woff?v=3.2.1') format('woff'), url('../../../fonts/font-awesome/font/fontawesome-webfont.ttf?v=3.2.1') format('truetype'), url('../../../fonts/font-awesome/font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1') format('svg'); font-weight: normal; font-style: normal; } @@ -1709,30 +1709,33 @@ table th[class*="span"], font-size: 1.3333333333333em; } a [class^="icon-"], -a [class^="icon-"]:before, -a [class*=" icon-"], -a [class*=" icon-"]:before { +a [class*=" icon-"] { display: inline; } [class^="icon-"].icon-fixed-width, [class*=" icon-"].icon-fixed-width { display: inline-block; - width: 1.2857142857143em; - text-align: center; + width: 1.1428571428571em; + text-align: right; + padding-right: 0.28571428571429em; } [class^="icon-"].icon-fixed-width.icon-large, [class*=" icon-"].icon-fixed-width.icon-large { - width: 1.5714285714286em; + width: 1.4285714285714em; } -ul.icons-ul { - list-style-type: none; - text-indent: -0.71428571428571em; +.icons-ul { margin-left: 2.1428571428571em; + list-style-type: none; } -ul.icons-ul > li .icon-li { - width: 0.71428571428571em; - display: inline-block; +.icons-ul > li { + position: relative; +} +.icons-ul .icon-li { + position: absolute; + left: -2.1428571428571em; + width: 2.1428571428571em; text-align: center; + line-height: inherit; } [class^="icon-"].hide, [class*=" icon-"].hide { @@ -1902,6 +1905,10 @@ ul.icons-ul > li .icon-li { .btn.btn-large [class*=" icon-"].pull-right.icon-2x { margin-left: .2em; } +.nav-list [class^="icon-"], +.nav-list [class*=" icon-"] { + line-height: inherit; +} .icon-stack { position: relative; display: inline-block; @@ -1932,6 +1939,11 @@ ul.icons-ul > li .icon-li { -webkit-animation: spin 2s infinite linear; animation: spin 2s infinite linear; } +a .icon-stack, +a .icon-spin { + display: inline-block; + text-decoration: none; +} @-moz-keyframes spin { 0% { -moz-transform: rotate(0deg); @@ -2010,6 +2022,13 @@ ul.icons-ul > li .icon-li { -o-transform: scale(1,-1); transform: scale(1,-1); } +a .icon-rotate-90:before, +a .icon-rotate-180:before, +a .icon-rotate-270:before, +a .icon-flip-horizontal:before, +a .icon-flip-vertical:before { + display: inline-block; +} .icon-glass:before { content: "\f000"; } @@ -2019,7 +2038,7 @@ ul.icons-ul > li .icon-li { .icon-search:before { content: "\f002"; } -.icon-envelope:before { +.icon-envelope-alt:before { content: "\f003"; } .icon-heart:before { @@ -2058,12 +2077,14 @@ ul.icons-ul > li .icon-li { .icon-zoom-out:before { content: "\f010"; } +.icon-power-off:before, .icon-off:before { content: "\f011"; } .icon-signal:before { content: "\f012"; } +.icon-gear:before, .icon-cog:before { content: "\f013"; } @@ -2073,7 +2094,7 @@ ul.icons-ul > li .icon-li { .icon-home:before { content: "\f015"; } -.icon-file:before { +.icon-file-alt:before { content: "\f016"; } .icon-time:before { @@ -2097,8 +2118,8 @@ ul.icons-ul > li .icon-li { .icon-play-circle:before { content: "\f01d"; } -.icon-repeat:before, -.icon-rotate-right:before { +.icon-rotate-right:before, +.icon-repeat:before { content: "\f01e"; } .icon-refresh:before { @@ -2293,8 +2314,8 @@ ul.icons-ul > li .icon-li { .icon-arrow-down:before { content: "\f063"; } -.icon-share-alt:before, -.icon-mail-forward:before { +.icon-mail-forward:before, +.icon-share-alt:before { content: "\f064"; } .icon-resize-full:before { @@ -2387,16 +2408,17 @@ ul.icons-ul > li .icon-li { .icon-key:before { content: "\f084"; } +.icon-gears:before, .icon-cogs:before { content: "\f085"; } .icon-comments:before { content: "\f086"; } -.icon-thumbs-up:before { +.icon-thumbs-up-alt:before { content: "\f087"; } -.icon-thumbs-down:before { +.icon-thumbs-down-alt:before { content: "\f088"; } .icon-star-half:before { @@ -2435,6 +2457,7 @@ ul.icons-ul > li .icon-li { .icon-phone:before { content: "\f095"; } +.icon-unchecked:before, .icon-check-empty:before { content: "\f096"; } @@ -2534,6 +2557,7 @@ ul.icons-ul > li .icon-li { .icon-copy:before { content: "\f0c5"; } +.icon-paperclip:before, .icon-paper-clip:before { content: "\f0c6"; } @@ -2606,14 +2630,14 @@ ul.icons-ul > li .icon-li { .icon-sort-up:before { content: "\f0de"; } -.icon-envelope-alt:before { +.icon-envelope:before { content: "\f0e0"; } .icon-linkedin:before { content: "\f0e1"; } -.icon-undo:before, -.icon-rotate-left:before { +.icon-rotate-left:before, +.icon-undo:before { content: "\f0e2"; } .icon-legal:before { @@ -2670,7 +2694,7 @@ ul.icons-ul > li .icon-li { .icon-food:before { content: "\f0f5"; } -.icon-file-alt:before { +.icon-file-text-alt:before { content: "\f0f6"; } .icon-building:before { @@ -2748,10 +2772,13 @@ ul.icons-ul > li .icon-li { .icon-circle:before { content: "\f111"; } -.icon-reply:before, -.icon-mail-reply:before { +.icon-mail-reply:before, +.icon-reply:before { content: "\f112"; } +.icon-github-alt:before { + content: "\f113"; +} .icon-folder-close-alt:before { content: "\f114"; } @@ -2921,6 +2948,187 @@ ul.icons-ul > li .icon-li { .icon-share-sign:before { content: "\f14d"; } +.icon-compass:before { + content: "\f14e"; +} +.icon-collapse:before { + content: "\f150"; +} +.icon-collapse-top:before { + content: "\f151"; +} +.icon-expand:before { + content: "\f152"; +} +.icon-euro:before, +.icon-eur:before { + content: "\f153"; +} +.icon-gbp:before { + content: "\f154"; +} +.icon-dollar:before, +.icon-usd:before { + content: "\f155"; +} +.icon-rupee:before, +.icon-inr:before { + content: "\f156"; +} +.icon-yen:before, +.icon-jpy:before { + content: "\f157"; +} +.icon-renminbi:before, +.icon-cny:before { + content: "\f158"; +} +.icon-won:before, +.icon-krw:before { + content: "\f159"; +} +.icon-bitcoin:before, +.icon-btc:before { + content: "\f15a"; +} +.icon-file:before { + content: "\f15b"; +} +.icon-file-text:before { + content: "\f15c"; +} +.icon-sort-by-alphabet:before { + content: "\f15d"; +} +.icon-sort-by-alphabet-alt:before { + content: "\f15e"; +} +.icon-sort-by-attributes:before { + content: "\f160"; +} +.icon-sort-by-attributes-alt:before { + content: "\f161"; +} +.icon-sort-by-order:before { + content: "\f162"; +} +.icon-sort-by-order-alt:before { + content: "\f163"; +} +.icon-thumbs-up:before { + content: "\f164"; +} +.icon-thumbs-down:before { + content: "\f165"; +} +.icon-youtube-sign:before { + content: "\f166"; +} +.icon-youtube:before { + content: "\f167"; +} +.icon-xing:before { + content: "\f168"; +} +.icon-xing-sign:before { + content: "\f169"; +} +.icon-youtube-play:before { + content: "\f16a"; +} +.icon-dropbox:before { + content: "\f16b"; +} +.icon-stackexchange:before { + content: "\f16c"; +} +.icon-instagram:before { + content: "\f16d"; +} +.icon-flickr:before { + content: "\f16e"; +} +.icon-adn:before { + content: "\f170"; +} +.icon-bitbucket:before { + content: "\f171"; +} +.icon-bitbucket-sign:before { + content: "\f172"; +} +.icon-tumblr:before { + content: "\f173"; +} +.icon-tumblr-sign:before { + content: "\f174"; +} +.icon-long-arrow-down:before { + content: "\f175"; +} +.icon-long-arrow-up:before { + content: "\f176"; +} +.icon-long-arrow-left:before { + content: "\f177"; +} +.icon-long-arrow-right:before { + content: "\f178"; +} +.icon-apple:before { + content: "\f179"; +} +.icon-windows:before { + content: "\f17a"; +} +.icon-android:before { + content: "\f17b"; +} +.icon-linux:before { + content: "\f17c"; +} +.icon-dribbble:before { + content: "\f17d"; +} +.icon-skype:before { + content: "\f17e"; +} +.icon-foursquare:before { + content: "\f180"; +} +.icon-trello:before { + content: "\f181"; +} +.icon-female:before { + content: "\f182"; +} +.icon-male:before { + content: "\f183"; +} +.icon-gittip:before { + content: "\f184"; +} +.icon-sun:before { + content: "\f185"; +} +.icon-moon:before { + content: "\f186"; +} +.icon-archive:before { + content: "\f187"; +} +.icon-bug:before { + content: "\f188"; +} +.icon-vk:before { + content: "\f189"; +} +.icon-weibo:before { + content: "\f18a"; +} +.icon-renren:before { + content: "\f18b"; +} diff --git a/source/tpl_t3_blank/css/themes/orange/bootstrap.css b/source/tpl_t3_blank/css/themes/orange/bootstrap.css index 87f891ebe6..3a3c6c11b6 100644 --- a/source/tpl_t3_blank/css/themes/orange/bootstrap.css +++ b/source/tpl_t3_blank/css/themes/orange/bootstrap.css @@ -1684,8 +1684,8 @@ table th[class*="span"], @font-face { font-family: 'FontAwesome'; - src: url('../../../fonts/font-awesome/font/fontawesome-webfont.eot?v=3.1.0'); - src: url('../../../fonts/font-awesome/font/fontawesome-webfont.eot?#iefix&v=3.1.0') format('embedded-opentype'), url('../../../fonts/font-awesome/font/fontawesome-webfont.woff?v=3.1.0') format('woff'), url('../../../fonts/font-awesome/font/fontawesome-webfont.ttf?v=3.1.0') format('truetype'), url('../../../fonts/font-awesome/font/fontawesome-webfont.svg#fontawesomeregular?v=3.1.0') format('svg'); + src: url('../../../fonts/font-awesome/font/fontawesome-webfont.eot?v=3.2.1'); + src: url('../../../fonts/font-awesome/font/fontawesome-webfont.eot?#iefix&v=3.2.1') format('embedded-opentype'), url('../../../fonts/font-awesome/font/fontawesome-webfont.woff?v=3.2.1') format('woff'), url('../../../fonts/font-awesome/font/fontawesome-webfont.ttf?v=3.2.1') format('truetype'), url('../../../fonts/font-awesome/font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1') format('svg'); font-weight: normal; font-style: normal; } @@ -1709,30 +1709,33 @@ table th[class*="span"], font-size: 1.3333333333333em; } a [class^="icon-"], -a [class^="icon-"]:before, -a [class*=" icon-"], -a [class*=" icon-"]:before { +a [class*=" icon-"] { display: inline; } [class^="icon-"].icon-fixed-width, [class*=" icon-"].icon-fixed-width { display: inline-block; - width: 1.2857142857143em; - text-align: center; + width: 1.1428571428571em; + text-align: right; + padding-right: 0.28571428571429em; } [class^="icon-"].icon-fixed-width.icon-large, [class*=" icon-"].icon-fixed-width.icon-large { - width: 1.5714285714286em; + width: 1.4285714285714em; } -ul.icons-ul { - list-style-type: none; - text-indent: -0.71428571428571em; +.icons-ul { margin-left: 2.1428571428571em; + list-style-type: none; } -ul.icons-ul > li .icon-li { - width: 0.71428571428571em; - display: inline-block; +.icons-ul > li { + position: relative; +} +.icons-ul .icon-li { + position: absolute; + left: -2.1428571428571em; + width: 2.1428571428571em; text-align: center; + line-height: inherit; } [class^="icon-"].hide, [class*=" icon-"].hide { @@ -1902,6 +1905,10 @@ ul.icons-ul > li .icon-li { .btn.btn-large [class*=" icon-"].pull-right.icon-2x { margin-left: .2em; } +.nav-list [class^="icon-"], +.nav-list [class*=" icon-"] { + line-height: inherit; +} .icon-stack { position: relative; display: inline-block; @@ -1932,6 +1939,11 @@ ul.icons-ul > li .icon-li { -webkit-animation: spin 2s infinite linear; animation: spin 2s infinite linear; } +a .icon-stack, +a .icon-spin { + display: inline-block; + text-decoration: none; +} @-moz-keyframes spin { 0% { -moz-transform: rotate(0deg); @@ -2010,6 +2022,13 @@ ul.icons-ul > li .icon-li { -o-transform: scale(1,-1); transform: scale(1,-1); } +a .icon-rotate-90:before, +a .icon-rotate-180:before, +a .icon-rotate-270:before, +a .icon-flip-horizontal:before, +a .icon-flip-vertical:before { + display: inline-block; +} .icon-glass:before { content: "\f000"; } @@ -2019,7 +2038,7 @@ ul.icons-ul > li .icon-li { .icon-search:before { content: "\f002"; } -.icon-envelope:before { +.icon-envelope-alt:before { content: "\f003"; } .icon-heart:before { @@ -2058,12 +2077,14 @@ ul.icons-ul > li .icon-li { .icon-zoom-out:before { content: "\f010"; } +.icon-power-off:before, .icon-off:before { content: "\f011"; } .icon-signal:before { content: "\f012"; } +.icon-gear:before, .icon-cog:before { content: "\f013"; } @@ -2073,7 +2094,7 @@ ul.icons-ul > li .icon-li { .icon-home:before { content: "\f015"; } -.icon-file:before { +.icon-file-alt:before { content: "\f016"; } .icon-time:before { @@ -2097,8 +2118,8 @@ ul.icons-ul > li .icon-li { .icon-play-circle:before { content: "\f01d"; } -.icon-repeat:before, -.icon-rotate-right:before { +.icon-rotate-right:before, +.icon-repeat:before { content: "\f01e"; } .icon-refresh:before { @@ -2293,8 +2314,8 @@ ul.icons-ul > li .icon-li { .icon-arrow-down:before { content: "\f063"; } -.icon-share-alt:before, -.icon-mail-forward:before { +.icon-mail-forward:before, +.icon-share-alt:before { content: "\f064"; } .icon-resize-full:before { @@ -2387,16 +2408,17 @@ ul.icons-ul > li .icon-li { .icon-key:before { content: "\f084"; } +.icon-gears:before, .icon-cogs:before { content: "\f085"; } .icon-comments:before { content: "\f086"; } -.icon-thumbs-up:before { +.icon-thumbs-up-alt:before { content: "\f087"; } -.icon-thumbs-down:before { +.icon-thumbs-down-alt:before { content: "\f088"; } .icon-star-half:before { @@ -2435,6 +2457,7 @@ ul.icons-ul > li .icon-li { .icon-phone:before { content: "\f095"; } +.icon-unchecked:before, .icon-check-empty:before { content: "\f096"; } @@ -2534,6 +2557,7 @@ ul.icons-ul > li .icon-li { .icon-copy:before { content: "\f0c5"; } +.icon-paperclip:before, .icon-paper-clip:before { content: "\f0c6"; } @@ -2606,14 +2630,14 @@ ul.icons-ul > li .icon-li { .icon-sort-up:before { content: "\f0de"; } -.icon-envelope-alt:before { +.icon-envelope:before { content: "\f0e0"; } .icon-linkedin:before { content: "\f0e1"; } -.icon-undo:before, -.icon-rotate-left:before { +.icon-rotate-left:before, +.icon-undo:before { content: "\f0e2"; } .icon-legal:before { @@ -2670,7 +2694,7 @@ ul.icons-ul > li .icon-li { .icon-food:before { content: "\f0f5"; } -.icon-file-alt:before { +.icon-file-text-alt:before { content: "\f0f6"; } .icon-building:before { @@ -2748,10 +2772,13 @@ ul.icons-ul > li .icon-li { .icon-circle:before { content: "\f111"; } -.icon-reply:before, -.icon-mail-reply:before { +.icon-mail-reply:before, +.icon-reply:before { content: "\f112"; } +.icon-github-alt:before { + content: "\f113"; +} .icon-folder-close-alt:before { content: "\f114"; } @@ -2921,6 +2948,187 @@ ul.icons-ul > li .icon-li { .icon-share-sign:before { content: "\f14d"; } +.icon-compass:before { + content: "\f14e"; +} +.icon-collapse:before { + content: "\f150"; +} +.icon-collapse-top:before { + content: "\f151"; +} +.icon-expand:before { + content: "\f152"; +} +.icon-euro:before, +.icon-eur:before { + content: "\f153"; +} +.icon-gbp:before { + content: "\f154"; +} +.icon-dollar:before, +.icon-usd:before { + content: "\f155"; +} +.icon-rupee:before, +.icon-inr:before { + content: "\f156"; +} +.icon-yen:before, +.icon-jpy:before { + content: "\f157"; +} +.icon-renminbi:before, +.icon-cny:before { + content: "\f158"; +} +.icon-won:before, +.icon-krw:before { + content: "\f159"; +} +.icon-bitcoin:before, +.icon-btc:before { + content: "\f15a"; +} +.icon-file:before { + content: "\f15b"; +} +.icon-file-text:before { + content: "\f15c"; +} +.icon-sort-by-alphabet:before { + content: "\f15d"; +} +.icon-sort-by-alphabet-alt:before { + content: "\f15e"; +} +.icon-sort-by-attributes:before { + content: "\f160"; +} +.icon-sort-by-attributes-alt:before { + content: "\f161"; +} +.icon-sort-by-order:before { + content: "\f162"; +} +.icon-sort-by-order-alt:before { + content: "\f163"; +} +.icon-thumbs-up:before { + content: "\f164"; +} +.icon-thumbs-down:before { + content: "\f165"; +} +.icon-youtube-sign:before { + content: "\f166"; +} +.icon-youtube:before { + content: "\f167"; +} +.icon-xing:before { + content: "\f168"; +} +.icon-xing-sign:before { + content: "\f169"; +} +.icon-youtube-play:before { + content: "\f16a"; +} +.icon-dropbox:before { + content: "\f16b"; +} +.icon-stackexchange:before { + content: "\f16c"; +} +.icon-instagram:before { + content: "\f16d"; +} +.icon-flickr:before { + content: "\f16e"; +} +.icon-adn:before { + content: "\f170"; +} +.icon-bitbucket:before { + content: "\f171"; +} +.icon-bitbucket-sign:before { + content: "\f172"; +} +.icon-tumblr:before { + content: "\f173"; +} +.icon-tumblr-sign:before { + content: "\f174"; +} +.icon-long-arrow-down:before { + content: "\f175"; +} +.icon-long-arrow-up:before { + content: "\f176"; +} +.icon-long-arrow-left:before { + content: "\f177"; +} +.icon-long-arrow-right:before { + content: "\f178"; +} +.icon-apple:before { + content: "\f179"; +} +.icon-windows:before { + content: "\f17a"; +} +.icon-android:before { + content: "\f17b"; +} +.icon-linux:before { + content: "\f17c"; +} +.icon-dribbble:before { + content: "\f17d"; +} +.icon-skype:before { + content: "\f17e"; +} +.icon-foursquare:before { + content: "\f180"; +} +.icon-trello:before { + content: "\f181"; +} +.icon-female:before { + content: "\f182"; +} +.icon-male:before { + content: "\f183"; +} +.icon-gittip:before { + content: "\f184"; +} +.icon-sun:before { + content: "\f185"; +} +.icon-moon:before { + content: "\f186"; +} +.icon-archive:before { + content: "\f187"; +} +.icon-bug:before { + content: "\f188"; +} +.icon-vk:before { + content: "\f189"; +} +.icon-weibo:before { + content: "\f18a"; +} +.icon-renren:before { + content: "\f18b"; +} diff --git a/source/tpl_t3_blank/css/themes/red/bootstrap.css b/source/tpl_t3_blank/css/themes/red/bootstrap.css index 0bba48cc59..75b531de1a 100644 --- a/source/tpl_t3_blank/css/themes/red/bootstrap.css +++ b/source/tpl_t3_blank/css/themes/red/bootstrap.css @@ -1684,8 +1684,8 @@ table th[class*="span"], @font-face { font-family: 'FontAwesome'; - src: url('../../../fonts/font-awesome/font/fontawesome-webfont.eot?v=3.1.0'); - src: url('../../../fonts/font-awesome/font/fontawesome-webfont.eot?#iefix&v=3.1.0') format('embedded-opentype'), url('../../../fonts/font-awesome/font/fontawesome-webfont.woff?v=3.1.0') format('woff'), url('../../../fonts/font-awesome/font/fontawesome-webfont.ttf?v=3.1.0') format('truetype'), url('../../../fonts/font-awesome/font/fontawesome-webfont.svg#fontawesomeregular?v=3.1.0') format('svg'); + src: url('../../../fonts/font-awesome/font/fontawesome-webfont.eot?v=3.2.1'); + src: url('../../../fonts/font-awesome/font/fontawesome-webfont.eot?#iefix&v=3.2.1') format('embedded-opentype'), url('../../../fonts/font-awesome/font/fontawesome-webfont.woff?v=3.2.1') format('woff'), url('../../../fonts/font-awesome/font/fontawesome-webfont.ttf?v=3.2.1') format('truetype'), url('../../../fonts/font-awesome/font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1') format('svg'); font-weight: normal; font-style: normal; } @@ -1709,30 +1709,33 @@ table th[class*="span"], font-size: 1.3333333333333em; } a [class^="icon-"], -a [class^="icon-"]:before, -a [class*=" icon-"], -a [class*=" icon-"]:before { +a [class*=" icon-"] { display: inline; } [class^="icon-"].icon-fixed-width, [class*=" icon-"].icon-fixed-width { display: inline-block; - width: 1.2857142857143em; - text-align: center; + width: 1.1428571428571em; + text-align: right; + padding-right: 0.28571428571429em; } [class^="icon-"].icon-fixed-width.icon-large, [class*=" icon-"].icon-fixed-width.icon-large { - width: 1.5714285714286em; + width: 1.4285714285714em; } -ul.icons-ul { - list-style-type: none; - text-indent: -0.71428571428571em; +.icons-ul { margin-left: 2.1428571428571em; + list-style-type: none; } -ul.icons-ul > li .icon-li { - width: 0.71428571428571em; - display: inline-block; +.icons-ul > li { + position: relative; +} +.icons-ul .icon-li { + position: absolute; + left: -2.1428571428571em; + width: 2.1428571428571em; text-align: center; + line-height: inherit; } [class^="icon-"].hide, [class*=" icon-"].hide { @@ -1902,6 +1905,10 @@ ul.icons-ul > li .icon-li { .btn.btn-large [class*=" icon-"].pull-right.icon-2x { margin-left: .2em; } +.nav-list [class^="icon-"], +.nav-list [class*=" icon-"] { + line-height: inherit; +} .icon-stack { position: relative; display: inline-block; @@ -1932,6 +1939,11 @@ ul.icons-ul > li .icon-li { -webkit-animation: spin 2s infinite linear; animation: spin 2s infinite linear; } +a .icon-stack, +a .icon-spin { + display: inline-block; + text-decoration: none; +} @-moz-keyframes spin { 0% { -moz-transform: rotate(0deg); @@ -2010,6 +2022,13 @@ ul.icons-ul > li .icon-li { -o-transform: scale(1,-1); transform: scale(1,-1); } +a .icon-rotate-90:before, +a .icon-rotate-180:before, +a .icon-rotate-270:before, +a .icon-flip-horizontal:before, +a .icon-flip-vertical:before { + display: inline-block; +} .icon-glass:before { content: "\f000"; } @@ -2019,7 +2038,7 @@ ul.icons-ul > li .icon-li { .icon-search:before { content: "\f002"; } -.icon-envelope:before { +.icon-envelope-alt:before { content: "\f003"; } .icon-heart:before { @@ -2058,12 +2077,14 @@ ul.icons-ul > li .icon-li { .icon-zoom-out:before { content: "\f010"; } +.icon-power-off:before, .icon-off:before { content: "\f011"; } .icon-signal:before { content: "\f012"; } +.icon-gear:before, .icon-cog:before { content: "\f013"; } @@ -2073,7 +2094,7 @@ ul.icons-ul > li .icon-li { .icon-home:before { content: "\f015"; } -.icon-file:before { +.icon-file-alt:before { content: "\f016"; } .icon-time:before { @@ -2097,8 +2118,8 @@ ul.icons-ul > li .icon-li { .icon-play-circle:before { content: "\f01d"; } -.icon-repeat:before, -.icon-rotate-right:before { +.icon-rotate-right:before, +.icon-repeat:before { content: "\f01e"; } .icon-refresh:before { @@ -2293,8 +2314,8 @@ ul.icons-ul > li .icon-li { .icon-arrow-down:before { content: "\f063"; } -.icon-share-alt:before, -.icon-mail-forward:before { +.icon-mail-forward:before, +.icon-share-alt:before { content: "\f064"; } .icon-resize-full:before { @@ -2387,16 +2408,17 @@ ul.icons-ul > li .icon-li { .icon-key:before { content: "\f084"; } +.icon-gears:before, .icon-cogs:before { content: "\f085"; } .icon-comments:before { content: "\f086"; } -.icon-thumbs-up:before { +.icon-thumbs-up-alt:before { content: "\f087"; } -.icon-thumbs-down:before { +.icon-thumbs-down-alt:before { content: "\f088"; } .icon-star-half:before { @@ -2435,6 +2457,7 @@ ul.icons-ul > li .icon-li { .icon-phone:before { content: "\f095"; } +.icon-unchecked:before, .icon-check-empty:before { content: "\f096"; } @@ -2534,6 +2557,7 @@ ul.icons-ul > li .icon-li { .icon-copy:before { content: "\f0c5"; } +.icon-paperclip:before, .icon-paper-clip:before { content: "\f0c6"; } @@ -2606,14 +2630,14 @@ ul.icons-ul > li .icon-li { .icon-sort-up:before { content: "\f0de"; } -.icon-envelope-alt:before { +.icon-envelope:before { content: "\f0e0"; } .icon-linkedin:before { content: "\f0e1"; } -.icon-undo:before, -.icon-rotate-left:before { +.icon-rotate-left:before, +.icon-undo:before { content: "\f0e2"; } .icon-legal:before { @@ -2670,7 +2694,7 @@ ul.icons-ul > li .icon-li { .icon-food:before { content: "\f0f5"; } -.icon-file-alt:before { +.icon-file-text-alt:before { content: "\f0f6"; } .icon-building:before { @@ -2748,10 +2772,13 @@ ul.icons-ul > li .icon-li { .icon-circle:before { content: "\f111"; } -.icon-reply:before, -.icon-mail-reply:before { +.icon-mail-reply:before, +.icon-reply:before { content: "\f112"; } +.icon-github-alt:before { + content: "\f113"; +} .icon-folder-close-alt:before { content: "\f114"; } @@ -2921,6 +2948,187 @@ ul.icons-ul > li .icon-li { .icon-share-sign:before { content: "\f14d"; } +.icon-compass:before { + content: "\f14e"; +} +.icon-collapse:before { + content: "\f150"; +} +.icon-collapse-top:before { + content: "\f151"; +} +.icon-expand:before { + content: "\f152"; +} +.icon-euro:before, +.icon-eur:before { + content: "\f153"; +} +.icon-gbp:before { + content: "\f154"; +} +.icon-dollar:before, +.icon-usd:before { + content: "\f155"; +} +.icon-rupee:before, +.icon-inr:before { + content: "\f156"; +} +.icon-yen:before, +.icon-jpy:before { + content: "\f157"; +} +.icon-renminbi:before, +.icon-cny:before { + content: "\f158"; +} +.icon-won:before, +.icon-krw:before { + content: "\f159"; +} +.icon-bitcoin:before, +.icon-btc:before { + content: "\f15a"; +} +.icon-file:before { + content: "\f15b"; +} +.icon-file-text:before { + content: "\f15c"; +} +.icon-sort-by-alphabet:before { + content: "\f15d"; +} +.icon-sort-by-alphabet-alt:before { + content: "\f15e"; +} +.icon-sort-by-attributes:before { + content: "\f160"; +} +.icon-sort-by-attributes-alt:before { + content: "\f161"; +} +.icon-sort-by-order:before { + content: "\f162"; +} +.icon-sort-by-order-alt:before { + content: "\f163"; +} +.icon-thumbs-up:before { + content: "\f164"; +} +.icon-thumbs-down:before { + content: "\f165"; +} +.icon-youtube-sign:before { + content: "\f166"; +} +.icon-youtube:before { + content: "\f167"; +} +.icon-xing:before { + content: "\f168"; +} +.icon-xing-sign:before { + content: "\f169"; +} +.icon-youtube-play:before { + content: "\f16a"; +} +.icon-dropbox:before { + content: "\f16b"; +} +.icon-stackexchange:before { + content: "\f16c"; +} +.icon-instagram:before { + content: "\f16d"; +} +.icon-flickr:before { + content: "\f16e"; +} +.icon-adn:before { + content: "\f170"; +} +.icon-bitbucket:before { + content: "\f171"; +} +.icon-bitbucket-sign:before { + content: "\f172"; +} +.icon-tumblr:before { + content: "\f173"; +} +.icon-tumblr-sign:before { + content: "\f174"; +} +.icon-long-arrow-down:before { + content: "\f175"; +} +.icon-long-arrow-up:before { + content: "\f176"; +} +.icon-long-arrow-left:before { + content: "\f177"; +} +.icon-long-arrow-right:before { + content: "\f178"; +} +.icon-apple:before { + content: "\f179"; +} +.icon-windows:before { + content: "\f17a"; +} +.icon-android:before { + content: "\f17b"; +} +.icon-linux:before { + content: "\f17c"; +} +.icon-dribbble:before { + content: "\f17d"; +} +.icon-skype:before { + content: "\f17e"; +} +.icon-foursquare:before { + content: "\f180"; +} +.icon-trello:before { + content: "\f181"; +} +.icon-female:before { + content: "\f182"; +} +.icon-male:before { + content: "\f183"; +} +.icon-gittip:before { + content: "\f184"; +} +.icon-sun:before { + content: "\f185"; +} +.icon-moon:before { + content: "\f186"; +} +.icon-archive:before { + content: "\f187"; +} +.icon-bug:before { + content: "\f188"; +} +.icon-vk:before { + content: "\f189"; +} +.icon-weibo:before { + content: "\f18a"; +} +.icon-renren:before { + content: "\f18b"; +}