Skip to content
This repository has been archived by the owner on Nov 25, 2020. It is now read-only.

Commit

Permalink
Add OpenSans fonts - tweak style again
Browse files Browse the repository at this point in the history
  • Loading branch information
@cdujeu
cdujeu committed Jul 14, 2014
1 parent 3d3c1cd commit ca2faed
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 88 deletions.
2 changes: 1 addition & 1 deletion core/src/plugins/gui.ajax/res/js/ajaxplorer.js
View file

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion core/src/plugins/gui.ajax/res/js/ajaxplorer/class.AjxpPane.js
View file
Expand Up @@ -310,13 +310,14 @@ Class.create("AjxpPane", {
var paramPrefix = exp[1];
var registry = ajaxplorer.getXmlRegistry();
var configs = XPathSelectNodes(registry, "plugins/*[@id='"+plugin+"']/plugin_configs/property[contains(@name, '"+paramPrefix+"')]");
var defaults = XPathSelectNodes(registry, "plugins/*[@id='"+plugin+"']/server_settings/global_param[contains(@name, '"+paramPrefix+"') and @defaultImage]");
var defaults = XPathSelectNodes(registry, "plugins/*[@id='"+plugin+"']/server_settings/global_param[contains(@name, '"+paramPrefix+"')]");

var bgrounds = {};
configs.each(function(c){
bgrounds[c.getAttribute("name")] = c.firstChild.nodeValue.replace(/"/g, '');
});
defaults.each(function(d){
if(!d.getAttribute('defaultImage')) return;
var n = d.getAttribute("name");
if(!bgrounds[n]){
bgrounds[n] = d.getAttribute("defaultImage");
Expand Down
79 changes: 6 additions & 73 deletions core/src/plugins/gui.ajax/res/js/lib/leightbox/lightbox.js
View file
Expand Up @@ -13,53 +13,9 @@ And the lightbox gone wild by ParticleTree at http://particletree.com/features/l
*/

/*-------------------------------GLOBAL VARIABLES------------------------------------*/

var detect = navigator.userAgent.toLowerCase();
var OS,browser,version,total,thestring;
var currentLightBox, currentDraggable;

/*-----------------------------------------------------------------------------------------------*/

//Browser detect script origionally created by Peter Paul Koch at http://www.quirksmode.org/

function getBrowserInfo() {
if (checkIt('konqueror')) {
browser = "Konqueror";
OS = "Linux";
}
else if (checkIt('safari')) browser = "Safari" ;
else if (checkIt('omniweb')) browser = "OmniWeb" ;
else if (checkIt('opera')) browser = "Opera" ;
else if (checkIt('webtv')) browser = "WebTV";
else if (checkIt('icab')) browser = "iCab" ;
else if (checkIt('msie')) browser = "Internet Explorer" ;
else if (!checkIt('compatible')) {
browser = "Netscape Navigator" ;
version = detect.charAt(8);
}
else browser = "An unknown browser";

if (!version) version = detect.charAt(place + thestring.length);

if (!OS) {
if (checkIt('linux')) OS = "Linux";
else if (checkIt('x11')) OS = "Unix";
else if (checkIt('mac')) OS = "Mac" ;
else if (checkIt('win')) OS = "Windows" ;
else OS = "an unknown operating system";
}
}

function checkIt(string) {
place = detect.indexOf(string) + 1;
thestring = string;
return place;
}

/*-----------------------------------------------------------------------------------------------*/

Event.observe(window, 'load', initialize, false);
Event.observe(window, 'load', getBrowserInfo, false);
/*-----------------------------------------------------------------------------------*/
Event.observe(window, 'load', initializeLightbox, false);

var lightbox = Class.create();

Expand All @@ -80,34 +36,14 @@ lightbox.prototype = {

// Turn everything on - mainly the IE fixes
activate: function(){
if (browser == 'Internet Explorer'){
if (Prototype.Browser.IE){
this.getScroll();
//this.prepareIE('100%', 'hidden');
this.setScroll(0,0);
//this.hideSelects('hidden');
}
this.displayLightbox("block");
},

// Ie requires height to 100% and overflow hidden or else you can scroll down past the lightbox
prepareIE: function(height, overflow){
bod = document.getElementsByTagName('body')[0];
bod.style.overflow = overflow;
bod.style.height = height;

htm = document.getElementsByTagName('html')[0];
htm.style.overflow = overflow;
htm.style.height = height;
},

// In IE, select elements hover on top of the lightbox
hideSelects: function(visibility){
selects = document.getElementsByTagName('select');
for(i = 0; i < selects.length; i++) {
selects[i].style.visibility = visibility;
}
},


// Taken from lightbox implementation found at http://www.huddletogether.com/projects/lightbox/
getScroll: function(){
if (self.pageYOffset) {
Expand Down Expand Up @@ -180,20 +116,17 @@ lightbox.prototype = {

// Example of creating your own functionality once lightbox is initiated
deactivate: function(){
if (browser == "Internet Explorer"){
if (Prototype.Browser.IE){
this.setScroll(0,this.yPos);
//this.prepareIE("auto", "hidden");
//this.hideSelects("visible");
}

this.displayLightbox("none");
}
};

/*-----------------------------------------------------------------------------------------------*/

// Onload, make all links that need to trigger a lightbox active
function initialize(){
function initializeLightbox(){
addLightboxMarkup();
/*
lbox = document.getElementsByClassName('lbOn');
Expand Down
32 changes: 20 additions & 12 deletions core/src/plugins/gui.ajax/res/themes/orbit/css/ajaxplorer.css
View file
Expand Up @@ -3,9 +3,16 @@ table.sort-table tr:nth-child(even)
background-color: #f9f9f9;
}

/* FONTS */

*{
font-family: "Open sans", "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
font-weight: lighter;
font-family: "Open Sans Light", "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
}

#content_pane div.thumbnail_selectable_cell.detailed div.thumbLabel,
div.infoPanelBasenameTitle
{
font-family: "Open Sans Regular", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;;
}

*:focus{
Expand Down Expand Up @@ -216,7 +223,6 @@ kbd {
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
font-weight: normal;
}

.thumbnail_selectable_cell.detailed div.thumbnail_cell_metadata{
Expand Down Expand Up @@ -3221,7 +3227,7 @@ div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed span.text_lab
}

#info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed{
padding: 7px 1px;
padding: 3px 1px;
cursor: default;
}

Expand All @@ -3230,8 +3236,7 @@ div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed span.text_lab
}

#info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbLabel{
font-weight: lighter;
font-size: 1.4em;
font-size: 1.2em;
color: #555;
}

Expand Down Expand Up @@ -3315,7 +3320,7 @@ div.infoPanelRow
td.infoPanelValue,
div.infoPanelValue
{
padding: 0px 0 20px;
padding: 0px 0 15px;
font-size: 1.5em;
color: #555;
line-height: 1.3em;
Expand All @@ -3330,7 +3335,7 @@ td.infoPanelLabel,
div.infoPanelLabel
{
width: 50%;
color: #999;
color: #000;
text-transform: uppercase;
font-size: 0.9em;
}
Expand All @@ -3349,9 +3354,12 @@ div.infoPanelLabel{
.panelContent div.panelHeader{
font-size: 1.3em;
padding: 16px 0 16px 0;

text-transform: uppercase;
color: #555;
color: #222;
}

.panelContent div.panelHeader:before{
content:"> ";
}

.panelContent.scrolling div.panelHeader{
Expand Down Expand Up @@ -5144,7 +5152,7 @@ div.horizontal_tabulator > div:not(.tabulatorContainer){
}

.breadcrumbs-one span::before{
border-left-color: #fb725c;
border-left-color: #ccc;
right: -1.05em;
z-index: 1;
}
Expand Down Expand Up @@ -5173,7 +5181,7 @@ div.horizontal_tabulator > div:not(.tabulatorContainer){
display: inline-block;
cursor: pointer;
padding: 20px 25px;
color: #fb725c;
color: #ccc;
}
.breadcrumbs-one i.ajxp-goto:hover{
color: #fb725c;
Expand Down
2 changes: 1 addition & 1 deletion core/src/plugins/gui.ajax/res/themes/orbit/css/allz.css
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions core/src/plugins/gui.ajax/res/themes/orbit/html/gui.html
View file
Expand Up @@ -52,6 +52,7 @@
</form>
</div>
<link rel="stylesheet" href="plugins/gui.ajax/res/themes/orbit/css/font-awesome.css"/>
<link rel="stylesheet" href="plugins/gui.ajax/res/themes/orbit/css/fontfaces.css"/>
<link rel="stylesheet" href="plugins/gui.ajax/res/themes/orbit/css/media.css"/>
<link rel="stylesheet" href="plugins/gui.ajax/res/themes/orbit/css/animate-custom.css"/>
</body>
Expand Down
1 change: 1 addition & 0 deletions core/src/plugins/gui.ajax/res/themes/orbit/html/gui_debug.html
View file
Expand Up @@ -71,6 +71,7 @@
</div>
</form>
</div>
<link rel="stylesheet" href="plugins/gui.ajax/res/themes/orbit/css/fontfaces.css"/>
<link rel="stylesheet" href="plugins/gui.ajax/res/themes/orbit/css/font-awesome.css"/>
<link rel="stylesheet" href="plugins/gui.ajax/res/themes/orbit/css/media.css"/>
<link rel="stylesheet" href="plugins/gui.ajax/res/themes/orbit/css/animate-custom.css"/>
Expand Down

0 comments on commit ca2faed

Please sign in to comment.