developers
/
orbit-basic
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'desktop_devin' of https://github.com/Rulingcom/orbit into desktop_devin

This commit is contained in:
Harry Bomrah 2012-04-17 21:20:36 +08:00
parent 95a1e266ae 1f44a10206
commit 7b391904f7
26 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/assets/images/stockBackground/1.jpg Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 516 KiB

BIN
app/assets/images/stockBackground/10.jpg Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 188 KiB

BIN
app/assets/images/stockBackground/11.jpg Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 246 KiB

BIN
app/assets/images/stockBackground/12.jpg Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 278 KiB

BIN
app/assets/images/stockBackground/2.jpg Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 651 KiB

BIN
app/assets/images/stockBackground/3.jpg Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 361 KiB

BIN
app/assets/images/stockBackground/4.jpg Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 100 KiB

BIN
app/assets/images/stockBackground/5.jpg Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 276 KiB

BIN
app/assets/images/stockBackground/6.jpg Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 427 KiB

BIN
app/assets/images/stockBackground/7.jpg Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 131 KiB

BIN
app/assets/images/stockBackground/8.jpg Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 176 KiB

BIN
app/assets/images/stockBackground/9.jpg Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 333 KiB

BIN
app/assets/images/stockBackground/thumb/1.jpg Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.7 KiB

BIN
app/assets/images/stockBackground/thumb/10.jpg Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
app/assets/images/stockBackground/thumb/11.jpg Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.8 KiB

BIN
app/assets/images/stockBackground/thumb/12.jpg Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.2 KiB

BIN
app/assets/images/stockBackground/thumb/2.jpg Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 32 KiB

BIN
app/assets/images/stockBackground/thumb/3.jpg Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.8 KiB

BIN
app/assets/images/stockBackground/thumb/4.jpg Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
app/assets/images/stockBackground/thumb/5.jpg Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
app/assets/images/stockBackground/thumb/6.jpg Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
app/assets/images/stockBackground/thumb/7.jpg Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.1 KiB

BIN
app/assets/images/stockBackground/thumb/8.jpg Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.5 KiB

BIN
app/assets/images/stockBackground/thumb/9.jpg Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.3 KiB

10
app/assets/stylesheets/desktopmain.css
View File

@ -355,11 +355,11 @@ a:focus { outline: none; }
.tinycanvas .viewport { width: auto; height: 100%; overflow: hidden; position: relative; } .tinycanvas .viewport { width: auto; height: 100%; overflow: hidden; position: relative; }
.tinycanvas .overview { position: absolute; left: 0; top: 0; } .tinycanvas .overview { position: absolute; left: 0; top: 0; }
.tinycanvas .scrollbar { position: absolute; z-index: 9; } .tinycanvas .scrollbar { position: absolute; z-index: 9; }
.tinycanvas .scrollbar.sb_h { left: 0; bottom: 0; height: 12px; } .tinycanvas .scrollbar.sb_h { left: 0; bottom: 0; height: 6px; }
.tinycanvas .scrollbar.sb_v { right: 0; top: 0; width: 12px; } .tinycanvas .scrollbar.sb_v { right: 0; top: 0; width: 6px; }
.tinycanvas .track { height: 100%; width: 12px; position: relative; } .tinycanvas .track { height: 100%; width: 6px; position: relative; }
.tinycanvas .thumb { height: 12px; width: 12px; cursor: pointer; overflow: hidden; position: absolute; top: 0; } .tinycanvas .thumb { height: 6px; width: 6px; cursor: pointer; overflow: hidden; position: absolute; top: 0; }
.tinycanvas .thumb .end { overflow: hidden; height: 12px; width: 12px; } .tinycanvas .thumb .end { overflow: hidden; height: 6px; width: 6px; }
.tinycanvas .disable{ display: none; } .tinycanvas .disable{ display: none; }
/* Orbit Notification */ /* Orbit Notification */

27
app/views/desktop/settings/themes.html.erb
View File

@ -65,20 +65,23 @@
<div id="st3" class="st_c"> <div id="st3" class="st_c">
<div class="stock_background"> <div class="stock_background">
<ul> <ul>
<li><a href="" class="sb1"><img src="" alt=""></a></li> <li><a href="" class="sb1"><img src="assets/stockBackground/thumb/1.jpg" alt=""></a></li>
<li><a href="" class="sb2"><img src="" alt=""></a></li> <li><a href="" class="sb2"><img src="assets/stockBackground/thumb/2.jpg" alt=""></a></li>
<li><a href="" class="sb3"><img src="" alt=""></a></li> <li><a href="" class="sb3"><img src="assets/stockBackground/thumb/3.jpg" alt=""></a></li>
<li><a href="" class="sb4"><img src="" alt=""></a></li> <li><a href="" class="sb4"><img src="assets/stockBackground/thumb/4.jpg" alt=""></a></li>
<li><a href="" class="sb5"><img src="" alt=""></a></li> <li><a href="" class="sb5"><img src="assets/stockBackground/thumb/5.jpg" alt=""></a></li>
<li><a href="" class="sb6"><img src="" alt=""></a></li> <li><a href="" class="sb6"><img src="assets/stockBackground/thumb/6.jpg" alt=""></a></li>
<li><a href="" class="sb7"><img src="" alt=""></a></li> <li><a href="" class="sb7"><img src="assets/stockBackground/thumb/7.jpg" alt=""></a></li>
<li><a href="" class="sb8"><img src="" alt=""></a></li> <li><a href="" class="sb8"><img src="assets/stockBackground/thumb/8.jpg" alt=""></a></li>
<li><a href="" class="sb9"><img src="" alt=""></a></li> <li><a href="" class="sb9"><img src="assets/stockBackground/thumb/9.jpg" alt=""></a></li>
<li><a href="" class="sb10"><img src="" alt=""></a></li> <li><a href="" class="sb10"><img src="assets/stockBackground/thumb/10.jpg" alt=""></a></li>
<li><a href="" class="sb11"><img src="" alt=""></a></li> <li><a href="" class="sb11"><img src="assets/stockBackground/thumb/11.jpg" alt=""></a></li>
<li><a href="" class="sb12"><img src="" alt=""></a></li> <li><a href="" class="sb12"><img src="assets/stockBackground/thumb/12.jpg" alt=""></a></li>
</ul> </ul>
</div> </div>
<div class="s_action">
<a href="" id="theme_submit" class="setting_btn thmc1 thmtxt w1 hh2 hp">Confirm</a>
</div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
</div> </div>