incubator-ooo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Dave Fisher <dave2w...@comcast.net>
Subject Re: CMS diff: styles.css
Date Thu, 26 Jul 2012 05:18:32 GMT
Joe, I totally agree. I'm sorry I'm distracted with my day job. I have to spend next week at
corporate HQ. I'll be too focused on work to pay close attention to AOO for the next 10 days.

Any Apache time I have will be related to mentoring Apache Flex. (And VOTE threads on ooo-private.)

Regards,
Dave
 
On Jul 25, 2012, at 3:38 PM, Joe Schaefer wrote:

> Keep up the great work Michal, just
> please remember to [Update] your
> CMS working copy every so often to
> pull in the latest changes and resolve
> any conflicts so Dave and company don't
> have to ;-).
> 
> 
> 
> 
>> ________________________________
>> From: Michal Hriň <michalhrin@aol.com>
>> To: ooo-dev@incubator.apache.org; joe_schaefer@yahoo.com 
>> Sent: Wednesday, July 25, 2012 6:28 PM
>> Subject: Re: CMS diff: styles.css
>> 
>> 
>> Don't worry with "styles.css", delete it ..  i'll try to upload it later.
>> 
>> 
>> Regards,
>> 
>> MH
>> 
>> 
>> 
>> I don't see any attempts to deal with these particular
> files from you Dave.  If it's a new directory with new
> files you mighttry committing from the parent dir. ----- Original Message -----
>> From: Dave Fisher <dave2wave@comcast.net>
>> To: ooo-dev@incubator.apache.org > Cc: 
>> Sent: Wednesday, July 25, 2012 6:06 PM
>> Subject: Re: CMS diff: styles.css
>> 
>> Joe,
>> 
>> I get conflicts with all of these.
>> 
>> I'm not sure how to apply these. What's up?
>> 
>> Regards,
>> Dave
>> 
>> On Jul 25, 2012, at 2:02 PM, Michal Hriň wrote:
>> 
>>> Clone URL (Committers only):
>>> 
>> https://cms.apache.org/redirect?new=anonymous;action=diff;uri=http://ooo-site.apache.org/sk%2Fproduct%2Fstyles.css
>> 
>>> Michal Hriň
>>> 
>>> Index: trunk/content/sk/product/styles.css
>>> ===================================================================
>>> --- trunk/content/sk/product/styles.css    (revision 0)
>>> +++ trunk/content/sk/product/styles.css    (working copy)
>>> @@ -0,0 +1,90 @@
>>> +/**************************************************************
>>> + *
>>> + * Licensed to the Apache Software Foundation (ASF) under one
>>> + * or more contributor license agreements.  See the NOTICE file
>>> + * distributed with this work for additional information
>>> + * regarding copyright ownership.  The ASF licenses this file
>>> + * to you under the Apache License, Version 2.0 (the
>>> + * "License"); you may not use this file except in compliance
>>> + * with the License.  You may obtain a copy of the License at
>>> + *
>>> + *  http://www.apache.org/licenses/LICENSE-2.0 >>  + *
>>> + * Unless required by applicable law or agreed to in writing,
>>> + * software distributed under the License is distributed on an
>>> + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
>>> + * KIND, either express or implied.  See the License for the
>>> + * specific language governing permissions and limitations
>>> + * under the License.
>>> + *
>>> + *************************************************************/
>>> +
>>> +/*
>>> +Unfortunatelly didn't find a way to add ids to UL element with 
>> MarkDown
>>> +
>>> +ul.test {
>>> +    list-style: none;
>>> +    margin: 10px;
>>> +    padding: 10px;
>>> +}
>>> +*/
>>> +
>>> +li.product-writer {
>>> +    background-image: url(/product/icons/writer.png);
>>> +    background-position: left center;
>>> +    background-repeat: no-repeat;
>>> +    line-height: 15px;
>>> +    list-style: none;
>>> +    margin: .4em 0;
>>> +    padding: 10px 10px 3px 50px;
>>> +}
>>> +
>>> +li.product-calc {
>>> +    background-image: url(/product/icons/calc.png);
>>> +    background-position: left center;
>>> +    background-repeat: no-repeat;
>>> +    line-height: 15px;
>>> +    list-style: none;
>>> +    margin: .4em 0;
>>> +    padding: 10px 10px 3px 50px;
>>> +}
>>> +
>>> +li.product-impress {
>>> +    background-image: url(/product/icons/impress.png);
>>> +    background-position: left center;
>>> +    background-repeat: no-repeat;
>>> +    line-height: 15px;
>>> +    list-style: none;
>>> +    margin: .4em 0;
>>> +    padding: 10px 10px 3px 50px;
>>> +}
>>> +
>>> +li.product-draw {
>>> +    background-image: url(/product/icons/draw.png);
>>> +    background-position: left center;
>>> +    background-repeat: no-repeat;
>>> +    line-height: 15px;
>>> +    list-style: none;
>>> +    margin: .4em 0;
>>> +    padding: 10px 10px 3px 50px;
>>> +}
>>> +
>>> +li.product-base {
>>> +    background-image: url(/product/icons/base.png);
>>> +    background-position: left center;
>>> +    background-repeat: no-repeat;
>>> +    line-height: 15px;
>>> +    list-style: none;
>>> +    margin: .4em 0;
>>> +    padding: 10px 10px 3px 50px;
>>> +}
>>> +
>>> +li.product-math {
>>> +    background-image: url(/product/icons/math.png);
>>> +    background-position: left center;
>>> +    background-repeat: no-repeat;
>>> +    line-height: 15px;
>>> +    list-style: none;
>>> +    margin: .4em 0;
>>> +    padding: 10px 10px 3px 50px;
>>> +}
>>> 
>>> Property changes on: trunk/content/sk/product/styles.css
>>> ___________________________________________________________________
>>> Added: svn:eol-style
>>> ## -0,0 +1 ##
>>> +native
>>> \ No newline at end of property
>>> 
>> 
>> 


Mime
View raw message