mirror of
https://github.com/twisterarmy/twister-calm.git
synced 2025-03-11 21:11:04 +00:00
Merge pull request #30 from iShift/master
fix original theme on all pages exclude options.html
This commit is contained in:
iHedgehog
commit
5efa49271c
@ -24,6 +24,7 @@
|
||||
<script src="js/twister_actions.js"></script>
|
||||
<script src="js/interface_common.js"></script>
|
||||
<script src="jquery-emotions/jquery.emotions.js"></script>
|
||||
<script src="js/calm.js"></script>
|
||||
|
||||
<script>
|
||||
$(document).ready(function(){initInterfaceFollowing()});
|
||||
@ -35,7 +36,8 @@
|
||||
|
||||
<body>
|
||||
|
||||
<!-- MENU SUPERIOR INIT -->
|
||||
<!-- MENU SUPERIOR INIT Calm-->
|
||||
<div style="display:none" class="calm_menu">
|
||||
<nav class="userMenu">
|
||||
<ul>
|
||||
<li class="userMenu-home"><a href="home.html"></a></li>
|
||||
@ -51,13 +53,46 @@
|
||||
</div>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
<!-- BUSCA -->
|
||||
</ul>
|
||||
</nav>
|
||||
<!-- MENU SUPERIOR END -->
|
||||
|
||||
|
||||
</div>
|
||||
<!-- MENU SUPERIOR END Calm -->
|
||||
<!-- MENU SUPERIOR INIT Original-->
|
||||
<div style="display:none" class="original_menu">
|
||||
<nav class="userMenu">
|
||||
<ul>
|
||||
<li class="userMenu-home"><a href="home.html">Home</a></li>
|
||||
<li class="userMenu-network"><a href="network.html">Network</a></li>
|
||||
<li class="userMenu-profile"><a href="profile-edit.html">Profile</a></li>
|
||||
<li class="userMenu-config current">
|
||||
<a class="userMenu-config-dropdown" href="#">
|
||||
<div class="config-menu dialog-modal">
|
||||
<div class="mini-profile-info">
|
||||
<div class="mini-profile-photo"><img src="img/grayed_avatar_placeholder_24.png" alt="user-photo"/></div>
|
||||
<a href="#" class="mini-profile-name">Fulano da Silva</a>
|
||||
<span class="mini-profile-view">View</span>
|
||||
</div>
|
||||
<a class="dropdown-menu-item" href="profile-edit.html">Setup account</a>
|
||||
<a class="dropdown-menu-item" href="following.html">Following users</a>
|
||||
<a class="dropdown-menu-item" href="network.html">Network config</a>
|
||||
<a class="dropdown-menu-item" href="login.html">Change user</a>
|
||||
<a class="direct-messages" href="#">Direct Messages</a>
|
||||
</div>
|
||||
</a>
|
||||
</li>
|
||||
<li class="userMenu-connections">
|
||||
<a href="#">
|
||||
<span class="messages-qtd" style="display:none;">12</span>
|
||||
</a>
|
||||
</li>
|
||||
<li class="userMenu-messages">
|
||||
<a href="#">
|
||||
<span class="messages-qtd" style="display:none;">12</span>
|
||||
</a>
|
||||
</li>
|
||||
</div>
|
||||
<!-- MENU SUPERIOR END Original -->
|
||||
<div class="wrapper">
|
||||
|
||||
<!-- LADO ESQUERDO DE MÓDULOS INIT -->
|
||||
|
||||
12
js/calm.js
12
js/calm.js
@ -76,17 +76,17 @@ function mensAutocomplete() {
|
||||
|
||||
function changeStyle() {
|
||||
var style, profile, menu;
|
||||
if(localStorage['theme'] == 'calm')
|
||||
{
|
||||
style = 'css/style.css';
|
||||
profile = 'css/profile.css';
|
||||
menu = '.calm_menu';
|
||||
}else if(localStorage['theme'] == 'original')
|
||||
if(localStorage['theme'] == 'original')
|
||||
{
|
||||
style = 'css/orange/style.css';
|
||||
profile = 'css/orange/profile.css';
|
||||
menu = '.original_menu';
|
||||
$(".userMenu-dhtindicator").hide();
|
||||
}else
|
||||
{
|
||||
style = 'css/style.css';
|
||||
profile = 'css/profile.css';
|
||||
menu = '.calm_menu';
|
||||
}
|
||||
$('#stylecss').attr('href', style);
|
||||
$('#profilecss').attr('href', profile);
|
||||
|
||||
23
login.html
23
login.html
@ -20,6 +20,7 @@
|
||||
<script src="js/polyglot.min.js"></script>
|
||||
<script src="js/interface_localization.js"></script>
|
||||
<script src="js/options.js"></script>
|
||||
<script src="js/calm.js"></script>
|
||||
|
||||
<script>
|
||||
$(document).ready(function(){initInterfaceLogin()});
|
||||
@ -31,7 +32,8 @@
|
||||
|
||||
<body>
|
||||
|
||||
<!-- MENU SUPERIOR INIT -->
|
||||
<!-- MENU SUPERIOR INIT CALM -->
|
||||
<div style="display:none" class="calm_menu">
|
||||
<nav class="userMenu">
|
||||
<ul>
|
||||
<li class="userMenu-home"><a href="home.html"></a></li>
|
||||
@ -52,7 +54,24 @@
|
||||
|
||||
</ul>
|
||||
</nav>
|
||||
<!-- MENU SUPERIOR END -->
|
||||
</div>
|
||||
<!-- MENU SUPERIOR END CALM-->
|
||||
<!-- MENU SUPERIOR INIT Original-->
|
||||
<div style="display:none" class="original_menu">
|
||||
<nav class="userMenu">
|
||||
<ul>
|
||||
<li class="userMenu-home"><a href="home.html">Home</a></li>
|
||||
<li class="userMenu-network"><a href="network.html">Network</a></li>
|
||||
<li class="userMenu-profile current"><a href="login.html">Login</a></li>
|
||||
<li class="userMenu-config">
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
</ul>
|
||||
</nav>
|
||||
</div>
|
||||
<!-- MENU SUPERIOR END Original-->
|
||||
|
||||
|
||||
<div class="wrapper">
|
||||
|
||||
46
network.html
46
network.html
@ -33,7 +33,8 @@
|
||||
|
||||
<body>
|
||||
|
||||
<!-- MENU SUPERIOR INIT -->
|
||||
<!-- MENU SUPERIOR INIT Calm -->
|
||||
<div style="display:none" class="calm_menu">
|
||||
<nav class="userMenu">
|
||||
<ul>
|
||||
<li class="userMenu-home"><a href="home.html"></a></li>
|
||||
@ -51,7 +52,50 @@
|
||||
</li>
|
||||
</ul>
|
||||
</nav>
|
||||
</div>
|
||||
<!-- MENU SUPERIOR END CALM-->
|
||||
<!-- MENU SUPERIOR INIT -->
|
||||
<div style="display:none" class="original_menu">
|
||||
<nav class="userMenu">
|
||||
<ul>
|
||||
<li class="userMenu-home"><a href="home.html">Home</a></li>
|
||||
<li class="userMenu-network current"><a href="network.html">Network</a></li>
|
||||
<li class="userMenu-profile"><a href="profile-edit.html">Profile</a></li>
|
||||
<li class="userMenu-config">
|
||||
<a class="userMenu-config-dropdown" href="#">
|
||||
<div class="config-menu dialog-modal">
|
||||
<div class="mini-profile-info">
|
||||
<div class="mini-profile-photo"><img src="img/grayed_avatar_placeholder_24.png" alt="user-photo"/></div>
|
||||
<a href="#" class="mini-profile-name">Fulano da Silva</a>
|
||||
<span class="mini-profile-view">View</span>
|
||||
</div>
|
||||
<a class="dropdown-menu-item" href="options.html">Options</a>
|
||||
<a class="dropdown-menu-item" href="profile-edit.html">Setup account</a>
|
||||
<a class="dropdown-menu-item" href="following.html">Following users</a>
|
||||
<a class="dropdown-menu-item" href="network.html">Network config</a>
|
||||
<a class="dropdown-menu-item" href="login.html">Change user</a>
|
||||
<a class="direct-messages" href="#">Direct Messages</a>
|
||||
</div>
|
||||
</a>
|
||||
</li>
|
||||
<li class="userMenu-connections">
|
||||
<a href="#">
|
||||
<span class="messages-qtd" style="display:none;">12</span>
|
||||
</a>
|
||||
</li>
|
||||
<li class="userMenu-messages">
|
||||
<a href="#">
|
||||
<span class="messages-qtd" style="display:none;">12</span>
|
||||
</a>
|
||||
</li>
|
||||
<li class="userMenu-search">
|
||||
<input type="text" class="userMenu-search-field" placeholder="search"/>
|
||||
</li>
|
||||
</ul>
|
||||
</nav>
|
||||
</div>
|
||||
<!-- MENU SUPERIOR END -->
|
||||
|
||||
|
||||
<div class="wrapper">
|
||||
|
||||
|
||||
28
options.html
28
options.html
@ -29,7 +29,8 @@
|
||||
|
||||
<body>
|
||||
|
||||
<!-- MENU SUPERIOR INIT -->
|
||||
<!-- MENU SUPERIOR INIT Calm-->
|
||||
<div style="display:none" class="calm_menu">
|
||||
<nav class="userMenu">
|
||||
<ul>
|
||||
<li class="userMenu-home"><a href="home.html"></a></li>
|
||||
@ -47,7 +48,30 @@
|
||||
</li>
|
||||
</ul>
|
||||
</nav>
|
||||
|
||||
</div>
|
||||
<!-- MENU SUPERIOR END Calm-->
|
||||
<!-- MENU SUPERIOR INIT Original-->
|
||||
<div style="display:none" class="original_menu">
|
||||
<nav class="userMenu">
|
||||
<ul>
|
||||
<li class="userMenu-home"><a href="home.html"></a></li>
|
||||
<li class="userMenu-options current"><a href="options.html">Options</a></li>
|
||||
<li class="userMenu-config">
|
||||
<a class="userMenu-config-dropdown" href="#">
|
||||
<div class="config-menu dialog-modal">
|
||||
<a class="dropdown-menu-item" href="options.html">Options</a>
|
||||
<a class="dropdown-menu-item" href="network.html">Network config</a>
|
||||
<a class="dropdown-menu-item" href="profile-edit.html">Setup account</a>
|
||||
<a class="dropdown-menu-item" href="following.html">Following users</a>
|
||||
<a class="dropdown-menu-item" href="login.html">Change user</a>
|
||||
</div>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</nav>
|
||||
</div>
|
||||
<!-- MENU SUPERIOR END Original-->
|
||||
|
||||
<div class="wrapper">
|
||||
|
||||
<div class="language">
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user